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

am: 7abba0a4bc Change-Id: I52ffd23a6daf6d69e90519024cf389c70196a8fc
2019-05-01 09:34:48 -07:00
parent 039b72df1f 7abba0a4bc
commit 0c107d5ce8
1 changed files with 2 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
@@ -419,7 +419,8 @@ public final class TelephonyPermissions {
        // settings to individually disable the new restrictions for privileged, preloaded
        // non-privileged, and non-preinstalled apps.
        if (!isIdentifierCheckDisabled() && (
-                (!isPreinstalled && !relax3PDeviceIdentifierCheck)
+                (isPrivApp && !relaxPrivDeviceIdentifierCheck)
+                        || (!isPreinstalled && !relax3PDeviceIdentifierCheck)
                        || (isPreinstalled && !isPrivApp && !relaxNonPrivDeviceIdentifierCheck))) {
            // The current package should only be reported in StatsLog if it has not previously been
            // reported for the currently invoked device identifier method.