diff options
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 10 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/OneTimeSafetyChecker.java | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 28e9acf8d883..1e434e17de5a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -7591,15 +7591,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { private void sendActiveAdminCommand(String action, Bundle extras, @UserIdInt int userId, ComponentName receiverComponent) { - if (VERBOSE_LOG) { - Slog.v(LOG_TAG, "sending intent " + action + " to " - + receiverComponent.flattenToShortString() + " on user " + userId); - } final Intent intent = new Intent(action); intent.setComponent(receiverComponent); if (extras != null) { intent.putExtras(extras); } + if (VERBOSE_LOG) { + Slog.v(LOG_TAG, "sendActiveAdminCommand(): broadcasting " + action + " to " + + receiverComponent.flattenToShortString() + " on user " + userId); + } mContext.sendBroadcastAsUser(intent, UserHandle.of(userId)); } @@ -12437,10 +12437,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { extras.putBoolean(DeviceAdminReceiver.EXTRA_OPERATION_SAFETY_STATE, isSafe); if (mOwners.hasDeviceOwner()) { + if (VERBOSE_LOG) Slog.v(LOG_TAG, "Notifying DO"); sendDeviceOwnerCommand(DeviceAdminReceiver.ACTION_OPERATION_SAFETY_STATE_CHANGED, extras); } for (int profileOwnerId : mOwners.getProfileOwnerKeys()) { + if (VERBOSE_LOG) Slog.v(LOG_TAG, "Notifying PO for user " + profileOwnerId); sendProfileOwnerCommand(DeviceAdminReceiver.ACTION_OPERATION_SAFETY_STATE_CHANGED, extras, profileOwnerId); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/OneTimeSafetyChecker.java b/services/devicepolicy/java/com/android/server/devicepolicy/OneTimeSafetyChecker.java index 257fc640f93c..86437a27a64d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/OneTimeSafetyChecker.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/OneTimeSafetyChecker.java @@ -60,7 +60,7 @@ final class OneTimeSafetyChecker implements DevicePolicySafetyChecker { mOperation = operation; mReason = reason; mRealSafetyChecker = service.getDevicePolicySafetyChecker(); - Slog.i(TAG, "OneTimeSafetyChecker constructor: operation= " + operationToString(operation) + Slog.i(TAG, "OneTimeSafetyChecker constructor: operation=" + operationToString(operation) + ", reason=" + operationSafetyReasonToString(reason) + ", realChecker=" + mRealSafetyChecker + ", maxDuration=" + SELF_DESTRUCT_TIMEOUT_MS + "ms"); |