diff options
| author | 2019-11-01 11:33:53 +0000 | |
|---|---|---|
| committer | 2020-03-26 09:47:58 +0000 | |
| commit | cfad989c72d3f309ac56bd0db04bb748b09ddf03 (patch) | |
| tree | 5232716381a0ef16e183af73eb9d497fb59bb2ac | |
| parent | e93ab1d3ee8d60fdf6995683ea3a4255d8ff5c95 (diff) | |
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)
| -rw-r--r-- | services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 08c1bb536211..1f75294de8e5 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 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) { |