From 58c52d4720b0d7dc1dfa87c8f52cd7daf244a4a0 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 18 May 2020 12:06:13 -0700 Subject: Check dump permission for "dumpsys permissionmgr" Test: dumpsys permissionmgr Fixes: 156434486 Change-Id: I76f72c6a11167d1ed5155fec1ef7ab7a1ba165d4 --- .../com/android/server/pm/permission/PermissionManagerService.java | 5 +++++ 1 file changed, 5 insertions(+) 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); } -- cgit v1.2.3-59-g8ed1b