Revert "Security fix for VPN app killable via lockscreen."
This reverts commit d7628d5621c912399cefcddd9977199d62df320c.
Reason for revert: Changes in one of the file has missing dependency CLs in the 24Q2 release. We can revert the single file and the security fix still work.
Bug: 304772709
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9daf85a51e3e57eaac806b6a437d91ee0a666fc5)
Merged-In: I55c23afc0c338c6c009b99822780f1998d4a624b
Change-Id: I55c23afc0c338c6c009b99822780f1998d4a624b
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt
index 89bb16c..4e87bee 100644
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt
@@ -27,53 +27,5 @@
val Kosmos.qsEventLogger: QsEventLoggerFake by
Kosmos.Fixture { QsEventLoggerFake(uiEventLoggerFake, instanceIdSequenceFake) }
-var Kosmos.qsTileFactory by Fixture<QSFactory>()
-
-val Kosmos.fgsManagerController by Fixture { FakeFgsManagerController() }
-
-val Kosmos.footerActionsController by Fixture {
- FooterActionsController(
- fgsManagerController = fgsManagerController,
- )
-}
-
-val Kosmos.qsSecurityFooterUtils by Fixture {
- QSSecurityFooterUtils(
- applicationContext,
- devicePolicyManager,
- userTracker,
- fakeExecutorHandler,
- activityStarter,
- securityController,
- looper,
- dialogTransitionAnimator,
- )
-}
-
-val Kosmos.footerActionsInteractor by Fixture {
- FooterActionsInteractorImpl(
- activityStarter = activityStarter,
- metricsLogger = metricsLogger,
- uiEventLogger = uiEventLogger,
- deviceProvisionedController = deviceProvisionedController,
- qsSecurityFooterUtils = qsSecurityFooterUtils,
- fgsManagerController = fgsManagerController,
- userSwitcherInteractor = userSwitcherInteractor,
- securityRepository = securityRepository,
- foregroundServicesRepository = foregroundServicesRepository,
- userSwitcherRepository = userSwitcherRepository,
- broadcastDispatcher = broadcastDispatcher,
- bgDispatcher = testDispatcher,
- )
-}
-
-val Kosmos.footerActionsViewModelFactory by Fixture {
- FooterActionsViewModel.Factory(
- context = applicationContext,
- falsingManager = falsingManager,
- footerActionsInteractor = footerActionsInteractor,
- globalActionsDialogLiteProvider = { mock() },
- activityStarter,
- showPowerButton = true,
- )
-}
+var Kosmos.newQSTileFactory by Kosmos.Fixture<NewQSTileFactory>()
+var Kosmos.qsTileFactory by Kosmos.Fixture<QSFactory>()
\ No newline at end of file