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

Commit 7ac7e477 authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Guard the location indicator logging with the flag 

Bug: 432055721
Test: atomtester on device
Flag: android.location.flags.location_indicators_enabled
Change-Id: Idb82c1c52b3ac913e72cfa418e7bf3b85b8708b7
parent f4243b2d

packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt

+34 −30
Original line number Diff line number Diff line
@@ -240,21 +240,22 @@ constructor( 
                }

                .distinct()



        if (locationAvailable) {

            // Types of location accesses were stored when iterating through the app ops in

            // #shouldDisplayLocationOp and now they will be logged and the state will be cleared

            logLocationAccesses()



            // Keep track of the current privacy items in order to determine whether to log the next

            // round of privacy item changes.

        val locationItems =

            val locationOp =

                activeAppOps

                .filter { item ->

                    (item.code == AppOpsManager.OP_FINE_LOCATION ||

                        item.code == AppOpsManager.OP_COARSE_LOCATION)

                    .filter {

                        currentUserProfiles.any { user -> user.id == UserHandle.getUserId(it.uid) }

                    }

                    .filter { item -> item.code == AppOpsManager.OP_FINE_LOCATION }

                    .distinct()

        val locationOpBySystem = locationItems.any { item -> isSystemApp(item) }

        val locationOpByBackground = locationItems.any { item -> isBackgroundApp(item) }

            val locationOpBySystem = locationOp.any { item -> isSystemApp(item) }

            val locationOpByBackground = locationOp.any { item -> isBackgroundApp(item) }

            synchronized(lock) {

                lastLocationIndicator = items.any { it.privacyType == PrivacyType.TYPE_LOCATION }

                lastLocationIndicatorWithSystem = lastLocationIndicator || locationOpBySystem
@@ -264,6 +265,7 @@ constructor( 
                lastHighPowerLocationOp =

                    activeAppOps.any { it.code == AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION }

            }

        }



        return items

    }
@@ -333,7 +335,6 @@ constructor( 
            when (appOpItem.code) {

                AppOpsManager.OP_PHONE_CALL_CAMERA,

                AppOpsManager.OP_CAMERA -> PrivacyType.TYPE_CAMERA

                AppOpsManager.OP_COARSE_LOCATION,

                AppOpsManager.OP_FINE_LOCATION -> PrivacyType.TYPE_LOCATION

                AppOpsManager.OP_PHONE_CALL_MICROPHONE,

                AppOpsManager.OP_RECEIVE_AMBIENT_TRIGGER_AUDIO,
@@ -367,10 +368,15 @@ constructor( 
     * [hasHighPowerLocationAccess]

     */

    private fun shouldDisplayLocationOp(item: AppOpItem): Boolean {

        if (

            item.code == AppOpsManager.OP_FINE_LOCATION ||

                item.code == AppOpsManager.OP_COARSE_LOCATION

        ) {

        if (!locationAvailable) {

            // This is to avoid unnecessary work in updating haXXXLocationAccess booleans, although

            // updating them does nothing since logLocationAccess() is not invoked in this case.

            // Note that the logic for "filtering locationOps by locationAvailable" is in

            // toPrivacyItemLocked(), not this method.

            return true

        }



        if (item.code == AppOpsManager.OP_FINE_LOCATION) {

            val isSystem = isSystemApp(item)

            val isBackground = isBackgroundApp(item)

            if (isSystem) {
@@ -385,11 +391,9 @@ constructor( 
            }

            return result

        }



        if (item.code == AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION) {

            synchronized(lock) { hasHighPowerLocationAccess = true }

        }



        return true

    }