From 46771d107fe76b9c8a591fa35f3b8d34260de799 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 9 Apr 2021 13:31:37 -0700 Subject: [PATCH] Fixed message on cmd device_policy is-operation-safe Test: adb shell cmd device_policy is-operation-safe 7 Bug: 172376923 Change-Id: Ia8bdcde96728507f78495f12255894e2f02dc978 --- .../DevicePolicyManagerServiceShellCommand.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerServiceShellCommand.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerServiceShellCommand.java index 8e31029769d0a..285ecfb6b4782 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerServiceShellCommand.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerServiceShellCommand.java @@ -100,8 +100,8 @@ final class DevicePolicyManagerServiceShellCommand extends ShellCommand { int operation = Integer.parseInt(getNextArgRequired()); int reason = mService.getUnsafeOperationReason(operation); boolean safe = reason == DevicePolicyManager.OPERATION_SAFETY_REASON_NONE; - pw.printf("Operation %s is %b. Reason: %s\n", - DevicePolicyManager.operationToString(operation), safe, + pw.printf("Operation %s is %s. Reason: %s\n", + DevicePolicyManager.operationToString(operation), safeToString(safe), DevicePolicyManager.operationSafetyReasonToString(reason)); return 0; } @@ -110,11 +110,14 @@ final class DevicePolicyManagerServiceShellCommand extends ShellCommand { int reason = Integer.parseInt(getNextArgRequired()); boolean safe = mService.isSafeOperation(reason); pw.printf("Operations affected by %s are %s\n", - DevicePolicyManager.operationSafetyReasonToString(reason), - (safe ? "SAFE" : "UNSAFE")); + DevicePolicyManager.operationSafetyReasonToString(reason), safeToString(safe)); return 0; } + private static String safeToString(boolean safe) { + return safe ? "SAFE" : "UNSAFE"; + } + private int runSetSafeOperation(PrintWriter pw) { int operation = Integer.parseInt(getNextArgRequired()); int reason = Integer.parseInt(getNextArgRequired());