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

Commit cfad989c authored by Oli Lan's avatar Oli Lan
Browse files

Check DUMP permission before dumping in RollbackManagerService. 

Bug: 143125031
Bug: 150949837
Test: atest CtsSecurityTestCases:android.security.cts.ServicePermissionsTest#testDumpProtected
Change-Id: Icd813d30eabc6d52a34bd3440a73d2e0876a89ed
Merged-In: Icd813d30eabc6d52a34bd3440a73d2e0876a89ed
(cherry picked from commit 8753d824)
parent e93ab1d3

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import android.util.SparseLongArray; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.LocalServices;

import com.android.server.Watchdog;
@@ -1479,6 +1480,8 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 


    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;



        IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");

        synchronized (mLock) {

            for (RollbackData data : mRollbacks) {