From 5873dbf4ed7e75f2251cdc46bab550ba27d19af3 Mon Sep 17 00:00:00 2001 From: Anton Potapov Date: Thu, 4 May 2023 15:31:39 +0100 Subject: [PATCH] Fix componentName of a selected app Test: manual Test: atest ControlsProviderSelectorActivityTest Fixes: 280336352 Change-Id: Ic97fd98e16d057bb89721785e7fcd9b90dca72ae --- .../controls/management/ControlsProviderSelectorActivity.kt | 2 +- .../management/ControlsProviderSelectorActivityTest.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt index 92aff0624bdc8..e60063248fb0d 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt @@ -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() diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt index 8dfd22378a14d..b2e37ccb045bf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt @@ -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> = argumentCaptor() verify(authorizedPanelsRepository).addAuthorizedPanels(capture(setCaptor)) assertThat(setCaptor.value).containsExactly(info.componentName.packageName) + val selectedComponentCaptor: ArgumentCaptor = argumentCaptor() + verify(controlsController).setPreferredSelection(capture(selectedComponentCaptor)) + assertThat(selectedComponentCaptor.value.componentName).isEqualTo(info.componentName) assertThat(activityRule.activity.triedToFinish).isTrue() }