Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3a2681 authored by Felipe Leme's avatar Felipe Leme
Browse files

DPMS logging improvements. 

Test: atest com.android.cts.devicepolicy.ProfileOwnerTest#testDevicePolicySafetyCheckerIntegration_onOperationSafetyStateChanged
Bug: 181627946

Change-Id: Id55acdd00eb4fe34b0458e6a8e7c4dc711f47f5a
parent b797729b

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -7591,15 +7591,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
















    private void sendActiveAdminCommand(String action, Bundle extras,







    private void sendActiveAdminCommand(String action, Bundle extras,











            @UserIdInt int userId, ComponentName receiverComponent) {







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







        final Intent intent = new Intent(action);











        intent.setComponent(receiverComponent);







        intent.setComponent(receiverComponent);











        if (extras != null) {







        if (extras != null) {











            intent.putExtras(extras);







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







        mContext.sendBroadcastAsUser(intent, UserHandle.of(userId));











    }







    }


























@@ -12437,10 +12437,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {









            extras.putBoolean(DeviceAdminReceiver.EXTRA_OPERATION_SAFETY_STATE, isSafe);







            extras.putBoolean(DeviceAdminReceiver.EXTRA_OPERATION_SAFETY_STATE, isSafe);



























            if (mOwners.hasDeviceOwner()) {







            if (mOwners.hasDeviceOwner()) {














                if (VERBOSE_LOG) Slog.v(LOG_TAG, "Notifying DO");











                sendDeviceOwnerCommand(DeviceAdminReceiver.ACTION_OPERATION_SAFETY_STATE_CHANGED,







                sendDeviceOwnerCommand(DeviceAdminReceiver.ACTION_OPERATION_SAFETY_STATE_CHANGED,











                        extras);







                        extras);











            }







            }











            for (int profileOwnerId : mOwners.getProfileOwnerKeys()) {







            for (int profileOwnerId : mOwners.getProfileOwnerKeys()) {














                if (VERBOSE_LOG) Slog.v(LOG_TAG, "Notifying PO for user " + profileOwnerId);











                sendProfileOwnerCommand(DeviceAdminReceiver.ACTION_OPERATION_SAFETY_STATE_CHANGED,







                sendProfileOwnerCommand(DeviceAdminReceiver.ACTION_OPERATION_SAFETY_STATE_CHANGED,











                        extras, profileOwnerId);







                        extras, profileOwnerId);











            }







            }

























services/devicepolicy/java/com/android/server/devicepolicy/OneTimeSafetyChecker.java



+1
−1


























File changed.
Contains only whitespace changes.