Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-01 09:05:42 +00:00
committed by Android (Google) Code Review
parent 956b55a733 de186b8cb7
commit 7abba0a4bc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -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.