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

Commit 413a63ef authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev... 

Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am: f5d5e5e4" into oc-dev-plus-aosp
am: 224b710a

Change-Id: Icdfe9487b2aa1d7d9245aaa87ccde048845b899d
parents 65d8ce46 224b710a

core/java/com/android/internal/util/DumpUtils.java

+9 −6
Original line number Diff line number Diff line
@@ -121,11 +121,14 @@ public final class DumpUtils { 
        final String[] pkgs = context.getPackageManager().getPackagesForUid(uid);

        if (pkgs != null) {

            for (String pkg : pkgs) {

                if (appOps.checkOpNoThrow(AppOpsManager.OP_GET_USAGE_STATS, uid,

                        pkg) == AppOpsManager.MODE_ALLOWED) {

                    appOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, uid, pkg);

                switch (appOps.checkOpNoThrow(AppOpsManager.OP_GET_USAGE_STATS, uid, pkg)) {

                    case AppOpsManager.MODE_ALLOWED:

                        if (DEBUG) Slog.v(TAG, "Found package " + pkg + " with "

                                + "android:get_usage_stats access");

                                + "android:get_usage_stats allowed");

                        return true;

                    case AppOpsManager.MODE_DEFAULT:

                        if (DEBUG) Slog.v(TAG, "Found package " + pkg + " with "

                                + "android:get_usage_stats default");

                        return true;

                }

            }