Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ControlsProviderSelectorActivity finish on

Browse Source 
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
Change-Id: I02ddaa5e823379510e9c81a8d803d5269e6d85ad
This commit is contained in:
Anton Potapov
2023-05-25 12:39:01 +01:00
parent 6c3482b1b9
commit 442c1002a8
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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