diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 3d523d9..113c9b6 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -12850,6 +12850,7 @@ public final class ActivityManagerService extends ActivityManagerNative pw.println(" i[ntents] [PACKAGE_NAME]: pending intent state"); pw.println(" p[rocesses] [PACKAGE_NAME]: process state"); pw.println(" o[om]: out of memory management"); + pw.println(" perm[issions]: URI permission grant state"); pw.println(" prov[iders] [COMP_SPEC ...]: content provider state"); pw.println(" provider [COMP_SPEC]: provider client-side state"); pw.println(" s[ervices] [COMP_SPEC ...]: service state"); @@ -12940,6 +12941,10 @@ public final class ActivityManagerService extends ActivityManagerNative synchronized (this) { dumpOomLocked(fd, pw, args, opti, true); } + } else if ("permissions".equals(cmd) || "perm".equals(cmd)) { + synchronized (this) { + dumpPermissionsLocked(fd, pw, args, opti, true, null); + } } else if ("provider".equals(cmd)) { String[] newArgs; String name; @@ -13055,6 +13060,11 @@ public final class ActivityManagerService extends ActivityManagerNative if (dumpAll) { pw.println("-------------------------------------------------------------------------------"); } + dumpPermissionsLocked(fd, pw, args, opti, dumpAll, dumpPackage); + pw.println(); + if (dumpAll) { + pw.println("-------------------------------------------------------------------------------"); + } mServices.dumpServicesLocked(fd, pw, args, opti, dumpAll, dumpClient, dumpPackage); pw.println(); if (dumpAll) { @@ -14075,6 +14085,18 @@ public final class ActivityManagerService extends ActivityManagerNative } } + if (!printedAnything) { + pw.println(" (nothing)"); + } + } + + void dumpPermissionsLocked(FileDescriptor fd, PrintWriter pw, String[] args, + int opti, boolean dumpAll, String dumpPackage) { + boolean needSep = false; + boolean printedAnything = false; + + pw.println("ACTIVITY MANAGER URI PERMISSIONS (dumpsys activity permissions)"); + if (mGrantedUriPermissions.size() > 0) { boolean printed = false; int dumpUid = -2; |