commit cfad989c72d3f309ac56bd0db04bb748b09ddf03
author Oli Lan <olilan@google.com> Fri Nov 01 11:33:53 2019 +0000
committer Oli Lan <olilan@google.com> Thu Mar 26 09:47:58 2020 +0000
tree 5232716381a0ef16e183af73eb9d497fb59bb2ac
parent e93ab1d3ee8d60fdf6995683ea3a4255d8ff5c95

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 8753d8249e40f55e2a565e109561e6ba184c2e4a)

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

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 08c1bb5..1f75294 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -58,6 +58,7 @@
 
 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 @@
 
     @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) {