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

Commit 2e3aebc5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Tempoarily allow priv-apps access to device identifiers"

parents 82193d0c 6e96da29

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -334,8 +334,7 @@ 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() && (

                (isPrivApp && !relaxPrivDeviceIdentifierCheck)

                (!isPreinstalled && !relax3PDeviceIdentifierCheck)

                        || (!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.