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

Commit a68ab187 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Do not use hidden isPrivilegedApp am: b1c57994

Change-Id: I2d2b7bce877e0c4f8f7291ffd49289d5a5db2fb7
parents 6bc1bfa5 b1c57994
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -6298,7 +6298,8 @@ message DeviceIdentifierAccessDenied {
    optional bool is_preinstalled = 3;

    // True if the package is privileged.
    optional bool is_priv_app = 4;
    // Starting from Android 11, this boolean is not set and will always be false.
    optional bool is_priv_app = 4 [deprecated = true];
}

/**
+2 −6
Original line number Diff line number Diff line
@@ -365,7 +365,6 @@ public final class TelephonyPermissions {
    private static boolean reportAccessDeniedToReadIdentifiers(Context context, int subId, int pid,
            int uid, String callingPackage, String message) {
        boolean isPreinstalled = false;
        boolean isPrivApp = false;
        ApplicationInfo callingPackageInfo = null;
        try {
            callingPackageInfo = context.getPackageManager().getApplicationInfoAsUser(
@@ -373,9 +372,6 @@ public final class TelephonyPermissions {
            if (callingPackageInfo != null) {
                if (callingPackageInfo.isSystemApp()) {
                    isPreinstalled = true;
                    if (callingPackageInfo.isPrivilegedApp()) {
                        isPrivApp = true;
                    }
                }
            }
        } catch (PackageManager.NameNotFoundException e) {
@@ -398,10 +394,10 @@ public final class TelephonyPermissions {
            }
            invokedMethods.add(message);
            StatsLog.write(StatsLog.DEVICE_IDENTIFIER_ACCESS_DENIED, callingPackage, message,
                    isPreinstalled, isPrivApp);
                    isPreinstalled, false);
        }
        Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message
                + ":isPreinstalled=" + isPreinstalled + ":isPrivApp=" + isPrivApp);
                + ":isPreinstalled=" + isPreinstalled);
        // if the target SDK is pre-Q then check if the calling package would have previously
        // had access to device identifiers.
        if (callingPackageInfo != null && (