Merge "(Take two) Do not hold lock when calling into NotificationManager" into sc-dev am: ac77fab34c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15284691 Change-Id: I25318bd0dc0693f02cc4fe2a74a5214aec74475d
2021-07-16 01:53:24 +00:00
parent cb9650b2d6 ac77fab34c
commit fea7f29511
1 changed files with 3 additions and 2 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -15019,10 +15019,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
            }
            if (active) {
                if (shouldSendNotification) {
-                    sendNetworkLoggingNotification();
+                    mHandler.post(() -> sendNetworkLoggingNotification());
                }
            } else {
-                mInjector.getNotificationManager().cancel(SystemMessage.NOTE_NETWORK_LOGGING);
+                mHandler.post(() -> mInjector.getNotificationManager().cancel(
+                        SystemMessage.NOTE_NETWORK_LOGGING));
            }
        });
    }