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

Commit cb923e38 authored by Eugene Susla's avatar Eugene Susla
Browse files

Make grant origin tracing more ergonomic 

Add missing package name, and separate grant logs from spammy flag update ones

Test: manual
Change-Id: I22d587e92c8b7c8e94492bac3596764ba4240eab
parent ce81d325

core/java/android/app/ApplicationPackageManager.java

+6 −4
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public class ApplicationPackageManager extends PackageManager { 
     * @hide

     */

    public static final boolean DEBUG_TRACE_GRANTS = false;

    public static final boolean DEBUG_TRACE_PERMISSION_UPDATES = false;



    private static final int DEFAULT_EPHEMERAL_COOKIE_MAX_SIZE_BYTES = 16384; // 16KB
@@ -690,7 +691,7 @@ public class ApplicationPackageManager extends PackageManager { 
            UserHandle user) {

        if (DEBUG_TRACE_GRANTS

                && shouldTraceGrant(packageName, permissionName, user.getIdentifier())) {

            Log.i(TAG, "App " + mContext.getPackageName() + " is granting "

            Log.i(TAG, "App " + mContext.getPackageName() + " is granting " + packageName + " "

                    + permissionName + " for user " + user.getIdentifier(), new RuntimeException());

        }

        try {
@@ -708,9 +709,9 @@ public class ApplicationPackageManager extends PackageManager { 


    @Override

    public void revokeRuntimePermission(String packageName, String permName, UserHandle user) {

        if (DEBUG_TRACE_GRANTS

        if (DEBUG_TRACE_PERMISSION_UPDATES

                && shouldTraceGrant(packageName, permName, user.getIdentifier())) {

            Log.i(TAG, "App " + mContext.getPackageName() + " is revoking "

            Log.i(TAG, "App " + mContext.getPackageName() + " is revoking " + packageName + " "

                    + permName + " for user " + user.getIdentifier(), new RuntimeException());

        }

        try {
@@ -734,9 +735,10 @@ public class ApplicationPackageManager extends PackageManager { 
    @Override

    public void updatePermissionFlags(String permName, String packageName,

            int flagMask, int flagValues, UserHandle user) {

        if (DEBUG_TRACE_GRANTS

        if (DEBUG_TRACE_PERMISSION_UPDATES

                && shouldTraceGrant(packageName, permName, user.getIdentifier())) {

            Log.i(TAG, "App " + mContext.getPackageName() + " is updating flags for "

                    + packageName + " "

                    + permName + " for user " + user.getIdentifier() + ": "

                    + DebugUtils.flagsToString(PackageManager.class, "FLAG_PERMISSION_", flagMask)

                    + " := " + DebugUtils.flagsToString(

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+5 −5
Original line number Diff line number Diff line
@@ -651,9 +651,9 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
    private void updatePermissionFlagsInternal(String permName, String packageName, int flagMask,

            int flagValues, int callingUid, int userId, boolean overridePolicy,

            PermissionCallback callback) {

        if (ApplicationPackageManager.DEBUG_TRACE_GRANTS

        if (ApplicationPackageManager.DEBUG_TRACE_PERMISSION_UPDATES

                && ApplicationPackageManager.shouldTraceGrant(packageName, permName, userId)) {

            Log.i(TAG, "System is updating flags for "

            Log.i(TAG, "System is updating flags for " + packageName + " "

                            + permName + " for user " + userId  + " "

                            + DebugUtils.flagsToString(

                                    PackageManager.class, "FLAG_PERMISSION_", flagMask)
@@ -1175,7 +1175,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            boolean overridePolicy, int callingUid, final int userId, PermissionCallback callback) {

        if (ApplicationPackageManager.DEBUG_TRACE_GRANTS

                && ApplicationPackageManager.shouldTraceGrant(packageName, permName, userId)) {

            Log.i(TAG, "System is granting "

            Log.i(TAG, "System is granting " + packageName + " "

                    + permName + " for user " + userId + " on behalf of uid " + callingUid

                    + " " + mPackageManagerInt.getNameForUid(callingUid),

                    new RuntimeException());
@@ -1334,9 +1334,9 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
    // TODO swap permission name and package name

    private void revokeRuntimePermissionInternal(String permName, String packageName,

            boolean overridePolicy, int callingUid, final int userId, PermissionCallback callback) {

        if (ApplicationPackageManager.DEBUG_TRACE_GRANTS

        if (ApplicationPackageManager.DEBUG_TRACE_PERMISSION_UPDATES

                && ApplicationPackageManager.shouldTraceGrant(packageName, permName, userId)) {

            Log.i(TAG, "System is revoking "

            Log.i(TAG, "System is revoking " + packageName + " "

                            + permName + " for user " + userId + " on behalf of uid " + callingUid

                            + " " + mPackageManagerInt.getNameForUid(callingUid),

                    new RuntimeException());