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

Commit b1c57994 authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Do not use hidden isPrivilegedApp 

Remove usage of isPrivilegedApp as it is used only for logging.

Bug: 140908357
Test: Build
Merged-In: I510e10cd17546ebd4aa59f14a3b10738e37e912d
Change-Id: I510e10cd17546ebd4aa59f14a3b10738e37e912d
parent fb9adf0d

cmds/statsd/src/atoms.proto

+2 −1
Original line number Diff line number Diff line
@@ -6237,7 +6237,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];

}



/**

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

+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 && (