Commit 41aac569 authored May 25, 2023 by Anton Potapov Committed by Android Build Coastguard Worker Sep 01, 2023

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

parent 73413a6a

packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,6 @@ open class ControlsProviderSelectorActivity @Inject constructor(
		putExtra(ControlsFavoritingActivity.EXTRA_FROM_PROVIDER_SELECTOR, true)
		}
		startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(this).toBundle())
		animateExitAndFinish()
		}
		}
		}

packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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