From 6e96da2927da7442bb067453a244ad0ceeefc13e Mon Sep 17 00:00:00 2001
From: Michael Groover <mpgroover@google.com>
Date: Fri, 8 Feb 2019 12:42:43 -0800
Subject: [PATCH] Tempoarily allow priv-apps access to device identifiers

Bug: 123646983
Test: Manually verified priv-apps could access identifiers
Change-Id: Ie39391a72202faf12c7b025006fab456e5231055
---
 .../com/android/internal/telephony/TelephonyPermissions.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
index b9ec7bf563705..9d78bf4bfb53c 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
@@ -334,8 +334,7 @@ public final class TelephonyPermissions {
         // settings to individually disable the new restrictions for privileged, preloaded
         // non-privileged, and non-preinstalled apps.
         if (!isIdentifierCheckDisabled() && (
-                (isPrivApp && !relaxPrivDeviceIdentifierCheck)
-                        || (!isPreinstalled && !relax3PDeviceIdentifierCheck)
+                (!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.