Merge "Check DUMP permission before dumping in RollbackManagerService." into qt-qpr1-dev am: 46028c13cf

Change-Id: I2a57b2346b4f9638606ac09ae02a88e5540a1d5f
This commit is contained in:
Oli Lan
2020-03-27 11:23:04 +00:00
committed by Automerger Merge Worker

View File

@@ -57,6 +57,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;
@@ -1390,6 +1391,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) {