Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd42a85b authored May 05, 2023 by Anton Potapov Committed by Automerger Merge Worker May 05, 2023

Merge "Fix componentName of a selected app" into udc-dev am: 3a9a83da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23026754

Change-Id: Ib37e827ee756654596cc2244a49194c2d3c85d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c2911888 3a9a83da

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ open class ControlsProviderSelectorActivity @Inject constructor(
		authorizedPanelsRepository.addAuthorizedPanels(
		setOf(serviceInfo.componentName.packageName)
		)
		val selected = SelectedItem.PanelItem(appName, componentName)
		val selected = SelectedItem.PanelItem(appName, serviceInfo.componentName)
		controlsController.setPreferredSelection(selected)
		animateExitAndFinish()
		openControlsOrigin()

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.systemui.SysuiTestCase
		import com.android.systemui.controls.ControlsServiceInfo
		import com.android.systemui.controls.controller.ControlsController
		import com.android.systemui.controls.panels.AuthorizedPanelsRepository
		import com.android.systemui.controls.ui.SelectedItem
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.settings.UserTracker
		@@ -190,6 +191,9 @@ class ControlsProviderSelectorActivityTest : SysuiTestCase() {
		val setCaptor: ArgumentCaptor<Set<String>> = argumentCaptor()
		verify(authorizedPanelsRepository).addAuthorizedPanels(capture(setCaptor))
		assertThat(setCaptor.value).containsExactly(info.componentName.packageName)
		val selectedComponentCaptor: ArgumentCaptor<SelectedItem> = argumentCaptor()
		verify(controlsController).setPreferredSelection(capture(selectedComponentCaptor))
		assertThat(selectedComponentCaptor.value.componentName).isEqualTo(info.componentName)

		assertThat(activityRule.activity.triedToFinish).isTrue()
		}