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-06-14 02:45:01 +0000 |
| commit | 05c52fc502aa921a0c6c5b91311b471dab2ed7e3 (patch) | |
| tree | cc5c401d6b4f54f941516c37e0e5e268778d345c | |
| parent | 4b195d3e3aee96d6ba7401cf66f845fca7df82ca (diff) | |
| download | base-05c52fc502aa921a0c6c5b91311b471dab2ed7e3.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 |