diff options
author | Anton Potapov <apotapov@google.com> | 2023-05-25 12:39:01 +0100 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-31 13:33:27 +0000 |
commit | 15c57882875d46eca14959eb31e97711a2d76e49 (patch) | |
tree | 82391fe267650e7a0bdbdb9de9e553cbbe347f92 | |
parent | ab24d7c1b3975aee49be7eed0d1f9754c9319d81 (diff) | |
download | base-15c57882875d46eca14959eb31e97711a2d76e49.tar.gz |
Remove ControlsProviderSelectorActivity finish on
ControlsFavoritingActivity start
When ControlsProviderSelectorActivity starts
ControlsFavouritingActivity it uses ControlsActivity instance for
transitions. ControlsActivity interacts with ControlsBindingController
to get a list of controls. This interaction prevents load from
happening because ControlsBindingController has a global state, and
prevents users from adding a second Controls app.
Removing finishing ControlsProviderSelectorActivity prevents
ControlsActivity from being started.
Test: manual with the steps from the bug
Test: atest ControlsProviderSelectorActivityTest
Fixes: 283070266
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:442c1002a8563c291c149d18e143e1880a82a27e)
Merged-In: I02ddaa5e823379510e9c81a8d803d5269e6d85ad
Change-Id: I02ddaa5e823379510e9c81a8d803d5269e6d85ad
2 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt index 3808e73ca085..5a3d21eacc14 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt @@ -214,7 +214,6 @@ open class ControlsProviderSelectorActivity @Inject constructor( putExtra(ControlsFavoritingActivity.EXTRA_FROM_PROVIDER_SELECTOR, true) } startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(this).toBundle()) - animateExitAndFinish() } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt index 8dfd22378a14..82aaccdbbf0a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt @@ -144,7 +144,7 @@ class ControlsProviderSelectorActivityTest : SysuiTestCase() { assertThat(activityRule.activity.lastStartedActivity?.component?.className) .isEqualTo(ControlsFavoritingActivity::class.java.name) - assertThat(activityRule.activity.triedToFinish).isTrue() + assertThat(activityRule.activity.triedToFinish).isFalse() } @Test |