diff options
7 files changed, 37 insertions, 27 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java index 6fea2aaf728b..412f5828828e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java @@ -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; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java index 279c678421da..3067d4507162 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java @@ -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; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java index d616ed30772a..15bc93e0419a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java @@ -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 diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyConstants.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyConstants.java index fec8a80a6a76..464d6f5ea835 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyConstants.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyConstants.java @@ -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; /** diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 3bfcb6def252..10e03b3ccb1e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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,29 +8500,40 @@ 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(); - mOwners.dump(pw); - pw.println(); - mDeviceAdminServiceController.dump(pw); - pw.println(); - dumpDevicePolicyData(pw); - pw.println(); - mConstants.dump(pw); - pw.println(); - mStatLogger.dump(pw); - pw.println(); - - pw.println("Encryption Status: " + getEncryptionStatusName(getEncryptionStatus())); - pw.println(); - mPolicyCache.dump(pw); - pw.println(); - mStateCache.dump(pw); - } + dumpImmutableState(pw); + synchronized (getLockObject()) { + mOwners.dump(pw); + pw.println(); + mDeviceAdminServiceController.dump(pw); + pw.println(); + dumpDevicePolicyData(pw); + pw.println(); + mConstants.dump(pw); + pw.println(); + mStatLogger.dump(pw); + pw.println(); + + pw.println("Encryption Status: " + getEncryptionStatusName(getEncryptionStatus())); + pw.println(); + mPolicyCache.dump(pw); + pw.println(); + 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) { diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceStateCacheImpl.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceStateCacheImpl.java index c3cb9b035ed2..1215253dacaf 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceStateCacheImpl.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceStateCacheImpl.java @@ -16,9 +16,9 @@ package com.android.server.devicepolicy; import android.app.admin.DeviceStateCache; +import android.util.IndentingPrintWriter; import com.android.internal.annotations.GuardedBy; -import com.android.internal.util.IndentingPrintWriter; /** * Implementation of {@link DeviceStateCache}, to which {@link DevicePolicyManagerService} pushes diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java index 7649af4ee911..cced359e8d5a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java @@ -33,6 +33,7 @@ import android.os.UserManager; import android.os.UserManagerInternal; import android.util.ArrayMap; import android.util.AtomicFile; +import android.util.IndentingPrintWriter; import android.util.Log; import android.util.Pair; import android.util.Slog; @@ -42,7 +43,6 @@ import android.util.Xml; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FastXmlSerializer; -import com.android.internal.util.IndentingPrintWriter; import com.android.server.LocalServices; import com.android.server.wm.ActivityTaskManagerInternal; |