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

Commit 21ad6db7 authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Clean up device identifier access logging" into rvc-dev am: 01be3963... 

Merge "Clean up device identifier access logging" into rvc-dev am: 01be3963 am: a4b0ffd0 am: 522861c3

Change-Id: I67575d46ab6f456fda8a85ca524f9bed09fccbe5
parents c643e9f2 522861c3

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+0 −2
Original line number Diff line number Diff line
@@ -9184,8 +9184,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            return true;

        }













        Log.w(LOG_TAG, String.format("Package %s (uid=%d, pid=%d) cannot access Device IDs",













                    packageName, uid, pid));















        return false;















    }















































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



+2
−1




























Original line number
Diff line number
Diff line








@@ -361,7 +361,8 @@ public final class TelephonyPermissions {













            TelephonyCommonStatsLog.write(TelephonyCommonStatsLog.DEVICE_IDENTIFIER_ACCESS_DENIED,















                    callingPackage, message, /* isPreinstalled= */ false, false);















        }













        Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message);













        Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message + ":"













                + subId);















        // if the target SDK is pre-Q then check if the calling package would have previously















        // had access to device identifiers.















        if (callingPackageInfo != null && (