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

1 files changed, 2 insertions, 9 deletions

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index e7b168a19568..e11c31c88c87 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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) {