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

Commit 7eb87216 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Automerger Merge Worker
Browse files

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

Merge "Check dump permission for "dumpsys permissionmgr"" into rvc-dev am: 088ef5e3 am: 74d33d3c

Change-Id: I6352d3d91392c375d1e63bd36bacb314c74edba4
parents 20051f5e 74d33d3c

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

    }