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

Merge "Fix componentName of a selected app" into udc-dev

Browse Source
This commit is contained in:
Anton Potapov
2023-05-05 10:47:39 +00:00
committed by Android (Google) Code Review
parent 83b3e82a7c 5873dbf4ed
commit 3a9a83dad9
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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()
}