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

Commit a965d65c authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Suppress warnings from AppOpsManager#checkPackage() 

AppOpsManager#checkPackage() is	the recommended API to check whether
a given package belongs to a certain UID or not.  You can check
whether a SecurityException is thrown or not to get the answer.

However, if the given package does not belong to the UID specified,
the app developer not only sees SecurityException but also sees the
warning in messages like below, which is a bit spammy and may actually
confuse QA team.

W AppOps  : Bad call: specified package com.android under uid 12345 but it is really -1
W AppOps  : java.lang.RuntimeException: here
W AppOps  :     at com.android.server.AppOpsService.getOpsRawLocked(AppOpsService.java:1330)
W AppOps  :     at com.android.server.AppOpsService.checkPackage(AppOpsService.java:1049)
W AppOps  :     at com.android.internal.app.IAppOpsService$Stub.onTransact(IAppOpsService.java:169)
W AppOps  :     at android.os.Binder.execTransact(Binder.java:696)

With this CL, AppOpsManager#checkPackage() no longer triggers the
above warnings in logcat.  Hopefully app developers do log something
in logcat if the package name / UID mismatch is actually unexpected.

This CL should have no semantic behavior change anyway.

Fixes: 67745316
Test: Locally verified by making the following API call.
        context.getSystemService(AppOpsManager.class)
                .checkPackage(12345, "com.android")
      While it still throws SecurityException, warning messages are
      no longer shown in the logcat.
Change-Id: Ic7af4ef84ad9e7ae5c0fbaa9cd1343f5443e8603
parent 60d54878

services/core/java/com/android/server/AppOpsService.java

+25 −13
Original line number Original line Diff line number Diff line
@@ -491,7 +491,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            return Collections.emptyList();

            return Collections.emptyList();

        }

        }

        synchronized (this) {

        synchronized (this) {

            Ops pkgOps = getOpsRawLocked(uid, resolvedPackageName, false);

            Ops pkgOps = getOpsRawLocked(uid, resolvedPackageName, false /* edit */,

                    false /* uidMismatchExpected */);

            if (pkgOps == null) {

            if (pkgOps == null) {

                return null;

                return null;

            }

            }
@@ -530,7 +531,8 @@ public class AppOpsService extends IAppOpsService.Stub { 




    private void pruneOp(Op op, int uid, String packageName) {

    private void pruneOp(Op op, int uid, String packageName) {

        if (op.time == 0 && op.rejectTime == 0) {

        if (op.time == 0 && op.rejectTime == 0) {

            Ops ops = getOpsRawLocked(uid, packageName, false);

            Ops ops = getOpsRawLocked(uid, packageName, false /* edit */,

                    false /* uidMismatchExpected */);

            if (ops != null) {

            if (ops != null) {

                ops.remove(op.op);

                ops.remove(op.op);

                if (ops.size() <= 0) {

                if (ops.size() <= 0) {
@@ -1046,7 +1048,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
    public int checkPackage(int uid, String packageName) {

    public int checkPackage(int uid, String packageName) {

        Preconditions.checkNotNull(packageName);

        Preconditions.checkNotNull(packageName);

        synchronized (this) {

        synchronized (this) {

            if (getOpsRawLocked(uid, packageName, true) != null) {

            Ops ops = getOpsRawLocked(uid, packageName, true /* edit */,

                    true /* uidMismatchExpected */);

            if (ops != null) {

                return AppOpsManager.MODE_ALLOWED;

                return AppOpsManager.MODE_ALLOWED;

            } else {

            } else {

                return AppOpsManager.MODE_ERRORED;

                return AppOpsManager.MODE_ERRORED;
@@ -1090,7 +1094,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
    private int noteOperationUnchecked(int code, int uid, String packageName,

    private int noteOperationUnchecked(int code, int uid, String packageName,

            int proxyUid, String proxyPackageName) {

            int proxyUid, String proxyPackageName) {

        synchronized (this) {

        synchronized (this) {

            Ops ops = getOpsRawLocked(uid, packageName, true);

            Ops ops = getOpsRawLocked(uid, packageName, true /* edit */,

                    false /* uidMismatchExpected */);

            if (ops == null) {

            if (ops == null) {

                if (DEBUG) Log.d(TAG, "noteOperation: no op for code " + code + " uid " + uid

                if (DEBUG) Log.d(TAG, "noteOperation: no op for code " + code + " uid " + uid

                        + " package " + packageName);

                        + " package " + packageName);
@@ -1148,7 +1153,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
        }

        }

        ClientState client = (ClientState)token;

        ClientState client = (ClientState)token;

        synchronized (this) {

        synchronized (this) {

            Ops ops = getOpsRawLocked(uid, resolvedPackageName, true);

            Ops ops = getOpsRawLocked(uid, resolvedPackageName, true /* edit */,

                    false /* uidMismatchExpected */);

            if (ops == null) {

            if (ops == null) {

                if (DEBUG) Log.d(TAG, "startOperation: no op for code " + code + " uid " + uid

                if (DEBUG) Log.d(TAG, "startOperation: no op for code " + code + " uid " + uid

                        + " package " + resolvedPackageName);

                        + " package " + resolvedPackageName);
@@ -1274,7 +1280,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
        return uidState;

        return uidState;

    }

    }





    private Ops getOpsRawLocked(int uid, String packageName, boolean edit) {

    private Ops getOpsRawLocked(int uid, String packageName, boolean edit,

            boolean uidMismatchExpected) {

        UidState uidState = getUidStateLocked(uid, edit);

        UidState uidState = getUidStateLocked(uid, edit);

        if (uidState == null) {

        if (uidState == null) {

            return null;

            return null;
@@ -1326,10 +1333,12 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    if (pkgUid != uid) {

                    if (pkgUid != uid) {

                        // Oops!  The package name is not valid for the uid they are calling

                        // Oops!  The package name is not valid for the uid they are calling

                        // under.  Abort.

                        // under.  Abort.

                        if (!uidMismatchExpected) {

                            RuntimeException ex = new RuntimeException("here");

                            RuntimeException ex = new RuntimeException("here");

                            ex.fillInStackTrace();

                            ex.fillInStackTrace();

                            Slog.w(TAG, "Bad call: specified package " + packageName

                            Slog.w(TAG, "Bad call: specified package " + packageName

                                    + " under uid " + uid + " but it is really " + pkgUid, ex);

                                    + " under uid " + uid + " but it is really " + pkgUid, ex);

                        }

                        return null;

                        return null;

                    }

                    }

                } finally {

                } finally {
@@ -1359,7 +1368,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
    }

    }





    private Op getOpLocked(int code, int uid, String packageName, boolean edit) {

    private Op getOpLocked(int code, int uid, String packageName, boolean edit) {

        Ops ops = getOpsRawLocked(uid, packageName, edit);

        Ops ops = getOpsRawLocked(uid, packageName, edit,

                false /* uidMismatchExpected */);

        if (ops == null) {

        if (ops == null) {

            return null;

            return null;

        }

        }
@@ -1393,7 +1403,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
                if (AppOpsManager.opAllowSystemBypassRestriction(code)) {

                if (AppOpsManager.opAllowSystemBypassRestriction(code)) {

                    // If we are the system, bypass user restrictions for certain codes

                    // If we are the system, bypass user restrictions for certain codes

                    synchronized (this) {

                    synchronized (this) {

                        Ops ops = getOpsRawLocked(uid, packageName, true);

                        Ops ops = getOpsRawLocked(uid, packageName, true /* edit */,

                                false /* uidMismatchExpected */);

                        if ((ops != null) && ops.isPrivileged) {

                        if ((ops != null) && ops.isPrivileged) {

                            return false;

                            return false;

                        }

                        }
@@ -1713,7 +1724,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
                        out.startTag(null, "uid");

                        out.startTag(null, "uid");

                        out.attribute(null, "n", Integer.toString(pkg.getUid()));

                        out.attribute(null, "n", Integer.toString(pkg.getUid()));

                        synchronized (this) {

                        synchronized (this) {

                            Ops ops = getOpsRawLocked(pkg.getUid(), pkg.getPackageName(), false);

                            Ops ops = getOpsRawLocked(pkg.getUid(), pkg.getPackageName(),

                                    false /* edit */, false /* uidMismatchExpected */);

                            // Should always be present as the list of PackageOps is generated

                            // Should always be present as the list of PackageOps is generated

                            // from Ops.

                            // from Ops.

                            if (ops != null) {

                            if (ops != null) {