Merge "Improved dumpsys device_policy:" (2389a16b) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,10 +36,10 @@ import android.os.UserManager;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.IndentingPrintWriter;
		import android.util.Log;
		import android.util.Slog;

		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.Preconditions;
		import com.android.internal.util.XmlUtils;
		import com.android.server.pm.UserRestrictionsUtils;

services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,12 +26,12 @@ import android.content.Context;
		import android.content.pm.ServiceInfo;
		import android.os.Handler;
		import android.os.IBinder;
		import android.util.IndentingPrintWriter;
		import android.util.Slog;
		import android.util.SparseArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.server.am.PersistentConnection;
		import com.android.server.appbinding.AppBindingUtils;

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,11 +18,11 @@ package com.android.server.devicepolicy;
		import android.annotation.UserIdInt;
		import android.app.admin.DevicePolicyCache;
		import android.app.admin.DevicePolicyManager;
		import android.util.IndentingPrintWriter;
		import android.util.SparseBooleanArray;
		import android.util.SparseIntArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.IndentingPrintWriter;

		/**
		* Implementation of {@link DevicePolicyCache}, to which {@link DevicePolicyManagerService} pushes

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyConstants.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -15,11 +15,10 @@
		*/
		package com.android.server.devicepolicy;

		import android.util.IndentingPrintWriter;
		import android.util.KeyValueListParser;
		import android.util.Slog;

		import com.android.internal.util.IndentingPrintWriter;

		import java.util.concurrent.TimeUnit;

		/**

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+31 −20

Original line number	Diff line number	Diff line
		@@ -244,6 +244,7 @@ import android.text.TextUtils;
		import android.text.format.DateUtils;
		import android.util.ArraySet;
		import android.util.AtomicFile;
		import android.util.IndentingPrintWriter;
		import android.util.Log;
		import android.util.Pair;
		import android.util.Slog;
		@@ -269,7 +270,6 @@ import com.android.internal.util.DumpUtils;
		import com.android.internal.util.FastXmlSerializer;
		import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
		import com.android.internal.util.FunctionalUtils.ThrowingSupplier;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.JournaledFile;
		import com.android.internal.util.Preconditions;
		import com.android.internal.util.StatLogger;
		@@ -8500,12 +8500,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		@Override
		protected void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {
		if (!DumpUtils.checkDumpPermission(mContext, LOG_TAG, printWriter)) return;
		IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, " ");

		synchronized (getLockObject()) {
		try (IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, " ")) {
		pw.println("Current Device Policy Manager state:");
		pw.increaseIndent();

		dumpImmutableState(pw);
		synchronized (getLockObject()) {
		mOwners.dump(pw);
		pw.println();
		mDeviceAdminServiceController.dump(pw);
		@@ -8524,6 +8525,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		mStateCache.dump(pw);
		}
		}
		}

		private void dumpImmutableState(IndentingPrintWriter pw) {
		pw.println("Immutable state:");
		pw.increaseIndent();
		pw.printf("mHasFeature=%b\n", mHasFeature);
		pw.printf("mIsWatch=%b\n", mIsWatch);
		pw.printf("mHasTelephonyFeature=%b\n", mHasTelephonyFeature);
		pw.decreaseIndent();
		}

		private String getEncryptionStatusName(int encryptionStatus) {
		switch (encryptionStatus) {