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

Commit a24b7e64 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add temporary debug logging."" into main

parents 368f3e00 05a7dbae

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

+2 −9
Original line number Diff line number Diff line
@@ -3285,15 +3285,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT)

                .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE)

                .toBundle();

        mInjector.binderWithCleanCallingIdentity(() -> {

            try {

                mContext.sendBroadcastAsUser(intent, new UserHandle(userHandle), null, options);

            } catch (SecurityException e) {

                // TODO(b/387259698) remove debug logging.

                Slog.d(LOG_TAG, "Exception broadcasting as UID " + Binder.getCallingUid(), e);

                throw e;

            }

        });

        mInjector.binderWithCleanCallingIdentity(() ->

                mContext.sendBroadcastAsUser(intent, new UserHandle(userHandle), null, options));

    }















    private void loadSettingsLocked(DevicePolicyData policy, int userHandle) {