summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Philip P. Moltmann <moltmann@google.com> 2020-05-18 12:06:13 -0700
committer Philip P. Moltmann <moltmann@google.com> 2020-05-18 12:06:13 -0700
commit58c52d4720b0d7dc1dfa87c8f52cd7daf244a4a0 (patch)
treee2785753426cb5b07eb4532eece1b1bd28b094b5
parent42de294ab3d7c80d8bbcc29b8ff89af05fd3e473 (diff)
Check dump permission for "dumpsys permissionmgr"
Test: dumpsys permissionmgr Fixes: 156434486 Change-Id: I76f72c6a11167d1ed5155fec1ef7ab7a1ba165d4
-rw-r--r--services/core/java/com/android/server/pm/permission/PermissionManagerService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 7d49f788c063..163504cb5011 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -124,6 +124,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.RoSystemProperties;
import com.android.internal.util.ArrayUtils;
+import com.android.internal.util.DumpUtils;
import com.android.internal.util.IntPair;
import com.android.internal.util.Preconditions;
import com.android.internal.util.function.pooled.PooledLambda;
@@ -421,6 +422,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
@Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+ if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) {
+ return;
+ }
+
mContext.getSystemService(PermissionControllerManager.class).dump(fd, args);
}