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

Commit 3dc1890b authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-4cfc5fcc7fcb4e28a3c5befdc77cd3ea" into...

Merge changes from topic "presubmit-am-4cfc5fcc7fcb4e28a3c5befdc77cd3ea" into tm-mainline-prod am: 35fa3aea

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



Change-Id: Ibc75e85d0fcdf3f81a50d60408958c4d1a538eb1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5723807 35fa3aea
Loading
Loading
Loading
Loading
+18 −3
Original line number Diff line number Diff line
@@ -228,6 +228,10 @@ class FgsManagerController @Inject constructor(
        synchronized(lock) {
            if (dialog == null) {

                runningServiceTokens.keys.forEach {
                    it.updateUiControl()
                }

                val dialog = SystemUIDialog(context)
                dialog.setTitle(R.string.fgs_manager_dialog_title)

@@ -396,10 +400,20 @@ class FgsManagerController @Inject constructor(
        val userId: Int,
        val packageName: String
    ) {
        val uiControl: UIControl by lazy {
            val uid = packageManager.getPackageUidAsUser(packageName, userId)
        val uid by lazy { packageManager.getPackageUidAsUser(packageName, userId) }

        private var uiControlInitialized = false
        var uiControl: UIControl = UIControl.NORMAL
            get() {
                if (!uiControlInitialized) {
                    updateUiControl()
                }
                return field
            }
            private set

            when (activityManager.getBackgroundRestrictionExemptionReason(uid)) {
        fun updateUiControl() {
            uiControl = when (activityManager.getBackgroundRestrictionExemptionReason(uid)) {
                PowerExemptionManager.REASON_SYSTEM_UID,
                PowerExemptionManager.REASON_DEVICE_DEMO_MODE -> UIControl.HIDE_ENTRY

@@ -412,6 +426,7 @@ class FgsManagerController @Inject constructor(
                PowerExemptionManager.REASON_SYSTEM_MODULE -> UIControl.HIDE_BUTTON
                else -> UIControl.NORMAL
            }
            uiControlInitialized = true
        }

        override fun equals(other: Any?): Boolean {