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

Merge "DPMS logging improvements." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-08 19:57:37 +00:00
committed by Android (Google) Code Review
parent f349d18f17 4d3a2681e0
commit e328d7006c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -7679,15 +7679,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));
}
@@ -12541,10 +12541,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);
}

2
services/devicepolicy/java/com/android/server/devicepolicy/OneTimeSafetyChecker.java
View File

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