diff options
| author | 2020-03-27 11:05:29 +0000 | |
|---|---|---|
| committer | 2020-03-27 11:05:29 +0000 | |
| commit | 46028c13cff10f8dbc276623aadb0ef38a677d91 (patch) | |
| tree | 56f61440a61b6993a83cdaaee6a9780b6abfaa13 | |
| parent | 9e6eec4743ae5adc83599391731fe716c964f81a (diff) | |
| parent | cfad989c72d3f309ac56bd0db04bb748b09ddf03 (diff) | |
Merge "Check DUMP permission before dumping in RollbackManagerService." into qt-qpr1-dev
| -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) { |