Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check dump permission for "dumpsys permissionmgr"" into rvc-dev am: 088ef5e3ff

Browse Source 
Change-Id: Ibd673ced5d9109f39f81a4539e685fd9fc5b5c4d
This commit is contained in:
Philip P. Moltmann
2020-05-19 02:56:25 +00:00
committed by Automerger Merge Worker
parent f5a1878aeb 088ef5e3ff
commit 1a45b85562
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -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);
}