Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed message on cmd device_policy is-operation-safe" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-09 21:57:54 +00:00
committed by Android (Google) Code Review
parent 88a1e89a3f 46771d107f
commit e8c798ba11
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerServiceShellCommand.java
View File

@@ -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());