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

Commit d76f0b7c authored by Faye Yan's avatar Faye Yan Committed by Android Build Coastguard Worker
Browse files

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
Fix: 304772709
Test: manually, locked and unlocked
Test: atest com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModelTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d7628d5621c912399cefcddd9977199d62df320c)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:180ffb12b4a23cdb72c296614aff615b8edd9782)
Merged-In: I384699d478e5abcee3a165afc45211b9ed96334a
Change-Id: I384699d478e5abcee3a165afc45211b9ed96334a
parent 881f464f

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

+26 −5
Original line number Diff line number Diff line
@@ -16,16 +16,37 @@ 


package com.android.systemui.qs



import android.app.admin.devicePolicyManager

import android.content.applicationContext

import android.os.fakeExecutorHandler

import android.os.looper

import com.android.internal.logging.metricsLogger

import com.android.internal.logging.uiEventLogger

import com.android.internal.logging.uiEventLoggerFake

import com.android.systemui.InstanceIdSequenceFake

import com.android.systemui.animation.dialogTransitionAnimator

import com.android.systemui.broadcast.broadcastDispatcher

import com.android.systemui.classifier.falsingManager

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.plugins.activityStarter

import com.android.systemui.plugins.qs.QSFactory

import com.android.systemui.qs.tiles.di.NewQSTileFactory

import com.android.systemui.qs.footer.domain.interactor.FooterActionsInteractorImpl

import com.android.systemui.qs.footer.foregroundServicesRepository

import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel

import com.android.systemui.security.data.repository.securityRepository

import com.android.systemui.settings.userTracker

import com.android.systemui.statusbar.policy.deviceProvisionedController

import com.android.systemui.statusbar.policy.securityController

import com.android.systemui.user.data.repository.userSwitcherRepository

import com.android.systemui.user.domain.interactor.userSwitcherInteractor

import com.android.systemui.util.mockito.mock



val Kosmos.instanceIdSequenceFake: InstanceIdSequenceFake by

    Kosmos.Fixture { InstanceIdSequenceFake(0) }

val Kosmos.qsEventLogger: QsEventLoggerFake by

    Kosmos.Fixture { QsEventLoggerFake(uiEventLoggerFake, instanceIdSequenceFake) }

val Kosmos.instanceIdSequenceFake: InstanceIdSequenceFake by Fixture { InstanceIdSequenceFake(0) }

val Kosmos.qsEventLogger: QsEventLoggerFake by Fixture {

    QsEventLoggerFake(uiEventLoggerFake, instanceIdSequenceFake)

}



var Kosmos.qsTileFactory by Fixture<QSFactory>()