Security fix for VPN app killable via lockscreen. Do not show the active apps dialog when the screen is locked. Instead prompt the user to unlock directly if clicked and only open the dialog on successsful unlock. Flag: NONE Bug: 304772709 Test: manually, locked and unlocked Test: atest com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModelTest (cherry picked from commit d7628d5621c912399cefcddd9977199d62df320c) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:598d7a18601a04b9904f0e170cc7c1777a3389ff) Merged-In: I384699d478e5abcee3a165afc45211b9ed96334a Change-Id: I384699d478e5abcee3a165afc45211b9ed96334a
diff --git a/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt index b3596a2..b9258ac 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt
@@ -30,6 +30,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.globalactions.GlobalActionsDialogLite +import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager import com.android.systemui.qs.dagger.QSFlagsModule.PM_LITE_ENABLED import com.android.systemui.qs.footer.data.model.UserSwitcherStatusModel @@ -54,6 +55,7 @@ private val footerActionsInteractor: FooterActionsInteractor, private val falsingManager: FalsingManager, private val globalActionsDialogLite: GlobalActionsDialogLite, + private val activityStarter: ActivityStarter, showPowerButton: Boolean, ) { /** The context themed with the Quick Settings colors. */ @@ -222,7 +224,14 @@ return } - footerActionsInteractor.showForegroundServicesDialog(expandable) + activityStarter.dismissKeyguardThenExecute( + { + footerActionsInteractor.showForegroundServicesDialog(expandable) + false /* if the dismiss should be deferred */ + }, + null /* cancelAction */, + true /* afterKeyguardGone */ + ) } private fun onUserSwitcherClicked(expandable: Expandable) { @@ -283,6 +292,7 @@ private val falsingManager: FalsingManager, private val footerActionsInteractor: FooterActionsInteractor, private val globalActionsDialogLiteProvider: Provider<GlobalActionsDialogLite>, + private val activityStarter: ActivityStarter, @Named(PM_LITE_ENABLED) private val showPowerButton: Boolean, ) { /** Create a [FooterActionsViewModel] bound to the lifecycle of [lifecycleOwner]. */ @@ -308,6 +318,7 @@ footerActionsInteractor, falsingManager, globalActionsDialogLite, + activityStarter, showPowerButton, ) }
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/footer/FooterActionsTestUtils.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/footer/FooterActionsTestUtils.kt index 1a893f8..a94acf9 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/footer/FooterActionsTestUtils.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/footer/FooterActionsTestUtils.kt
@@ -68,6 +68,7 @@ private val testableLooper: TestableLooper, private val scheduler: TestCoroutineScheduler, ) { + private val mockActivityStarter: ActivityStarter = mock<ActivityStarter>() /** Enable or disable the user switcher in the settings. */ fun setUserSwitcherEnabled(settings: GlobalSettings, enabled: Boolean, userId: Int) { settings.putBoolForUser(Settings.Global.USER_SWITCHER_ENABLED, enabled, userId) @@ -90,13 +91,14 @@ footerActionsInteractor, falsingManager, globalActionsDialogLite, + mockActivityStarter, showPowerButton, ) } /** Create a [FooterActionsInteractor] to be used in tests. */ fun footerActionsInteractor( - activityStarter: ActivityStarter = mock(), + activityStarter: ActivityStarter = mockActivityStarter, metricsLogger: MetricsLogger = FakeMetricsLogger(), uiEventLogger: UiEventLogger = UiEventLoggerFake(), deviceProvisionedController: DeviceProvisionedController = mock(),