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

Commit 0c107d5c authored by Michael Groover's avatar Michael Groover Committed by android-build-merger
Browse files

Merge "Revert "Tempoarily allow priv-apps access to device identifiers"" into qt-dev 

am: 7abba0a4

Change-Id: I52ffd23a6daf6d69e90519024cf389c70196a8fc
parents 039b72df 7abba0a4

telephony/java/com/android/internal/telephony/TelephonyPermissions.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -419,7 +419,8 @@ public final class TelephonyPermissions { 
        // settings to individually disable the new restrictions for privileged, preloaded

        // settings to individually disable the new restrictions for privileged, preloaded

        // non-privileged, and non-preinstalled apps.

        // non-privileged, and non-preinstalled apps.

        if (!isIdentifierCheckDisabled() && (

        if (!isIdentifierCheckDisabled() && (

                (!isPreinstalled && !relax3PDeviceIdentifierCheck)

                (isPrivApp && !relaxPrivDeviceIdentifierCheck)

                        || (!isPreinstalled && !relax3PDeviceIdentifierCheck)

                        || (isPreinstalled && !isPrivApp && !relaxNonPrivDeviceIdentifierCheck))) {

                        || (isPreinstalled && !isPrivApp && !relaxNonPrivDeviceIdentifierCheck))) {

            // The current package should only be reported in StatsLog if it has not previously been

            // The current package should only be reported in StatsLog if it has not previously been

            // reported for the currently invoked device identifier method.

            // reported for the currently invoked device identifier method.