From 8753d8249e40f55e2a565e109561e6ba184c2e4a Mon Sep 17 00:00:00 2001
From: Oli Lan <olilan@google.com>
Date: Fri, 1 Nov 2019 11:33:53 +0000
Subject: [PATCH] Check DUMP permission before dumping in
 RollbackManagerService.

Bug: 143125031
Test: atest CtsSecurityTestCases:android.security.cts.ServicePermissionsTest#testDumpProtected
Change-Id: Icd813d30eabc6d52a34bd3440a73d2e0876a89ed
---
 .../android/server/rollback/RollbackManagerServiceImpl.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index ef4c12e8145a8..9975aea2f2d79 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -53,6 +53,7 @@ import android.util.Slog;
 import android.util.SparseBooleanArray;
 
 import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.DumpUtils;
 import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.LocalServices;
 import com.android.server.Watchdog;
@@ -1133,6 +1134,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 (Rollback rollback : mRollbacks) {