Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check DUMP permission before dumping in RollbackManagerService.

Browse Source 
Bug: 143125031
Bug: 150949837
Test: atest CtsSecurityTestCases:android.security.cts.ServicePermissionsTest#testDumpProtected
Change-Id: Icd813d30eabc6d52a34bd3440a73d2e0876a89ed
Merged-In: Icd813d30eabc6d52a34bd3440a73d2e0876a89ed
(cherry picked from commit 8753d8249e)
This commit is contained in:
Oli Lan
2019-11-01 11:33:53 +00:00
parent e93ab1d3ee
commit cfad989c72
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
View File

@@ -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) {