Commit 939a99cd authored Jul 22, 2021 by Matt Pietal

Fix multiple control providers

Found an error in the logs:

ControlsBindingControllerImpl: Provider for
token:android.os.Binder@147a7f9 does not exist anymore

And then noticed that the ControlsActivity was being started by
framework when transitioning between ControlsFavoritingActivity and
ControlsProviderSelelctionActivity. This is strictly due to window
animations being enabled, and framework realizing that the
ControlsActivity will be visible momentarily between
activities. Previously uiController.show() was in the onStart()
method, which resulted in ControlsBindingControllerImpl rebinding to a
different service.

By moving to onResume(), the call to uiController.show() can be
avoided, hence avoiding the service rebinding so the controls can
correctly be shown in the favoriting activity.

Fixes: 191589943
Test: manual (requires multiple control services)

Change-Id: I634ab7c386c2098dc8f9971d320a8b80b8cd429a

parent ef8407ab

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt

+4 −8

Original line number	Diff line number	Diff line
		@@ -64,16 +64,12 @@ class ControlsActivity @Inject constructor(
		}
		}

		override fun onStart() {
		super.onStart()
		override fun onResume() {
		super.onResume()

		parent = requireViewById<ViewGroup>(R.id.global_actions_controls)
		parent.alpha = 0f
		uiController.show(parent, { finish() }, this)
		}

		override fun onResume() {
		super.onResume()

		ControlsAnimations.enterAnimation(parent).start()
		}
		@@ -82,8 +78,8 @@ class ControlsActivity @Inject constructor(
		finish()
		}

		override fun onStop() {
		super.onStop()
		override fun onPause() {
		super.onPause()

		uiController.hide()
		}