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

Commit f323bb19 authored by Faye Yan's avatar Faye Yan Committed by Automerger Merge Worker
Browse files

Merge "Security fix for VPN app killable via lockscreen." into udc-dev am: a72e33cc 

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



Change-Id: I63b696f0902db848c8b8826b6ab8ecdbaae629d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a770bbbf a72e33cc

packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt

+12 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.common.shared.model.Icon 
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 @@ class FooterActionsViewModel( 
    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 @@ class FooterActionsViewModel( 
            return

        }



        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 @@ class FooterActionsViewModel( 
        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 @@ class FooterActionsViewModel( 
                footerActionsInteractor,

                falsingManager,

                globalActionsDialogLite,

                activityStarter,

                showPowerButton,

            )

        }

packages/SystemUI/tests/utils/src/com/android/systemui/qs/footer/FooterActionsTestUtils.kt

+3 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ class FooterActionsTestUtils( 
    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 @@ class FooterActionsTestUtils( 
            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(),