Skip to content

Commit 15c5788

Browse files
Anton PotapovAndroid Build Coastguard Worker
authored andcommitted
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
1 parent ab24d7c commit 15c5788

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ open class ControlsProviderSelectorActivity @Inject constructor(
214214
putExtra(ControlsFavoritingActivity.EXTRA_FROM_PROVIDER_SELECTOR, true)
215215
}
216216
startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(this).toBundle())
217-
animateExitAndFinish()
218217
}
219218
}
220219
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class ControlsProviderSelectorActivityTest : SysuiTestCase() {
144144
assertThat(activityRule.activity.lastStartedActivity?.component?.className)
145145
.isEqualTo(ControlsFavoritingActivity::class.java.name)
146146

147-
assertThat(activityRule.activity.triedToFinish).isTrue()
147+
assertThat(activityRule.activity.triedToFinish).isFalse()
148148
}
149149

150150
@Test

0 commit comments

Comments
 (0)