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

Commit de73e3dd authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "NotificationManagerService: add right lock for some methods." into main... 

Merge "NotificationManagerService: add right lock for some methods." into main am: a64fca58 am: dbf21119

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3109837



Change-Id: I2859c94ba5e1abd8727c92b55cd457015aa6571a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae8fb7fa dbf21119

services/core/java/com/android/server/notification/NotificationManagerService.java

+13 −7
Original line number Diff line number Diff line
@@ -2311,7 +2311,7 @@ public class NotificationManagerService extends SystemService { 














    @VisibleForTesting















    void clearNotifications() {













        synchronized (mNotificationList) {













        synchronized (mNotificationLock) {















            mEnqueuedNotifications.clear();















            mNotificationList.clear();















            mNotificationsByKey.clear();









@@ -2321,22 +2321,28 @@ public class NotificationManagerService extends SystemService {



























    @VisibleForTesting















    void addNotification(NotificationRecord r) {













        synchronized (mNotificationLock) {















            mNotificationList.add(r);















            mNotificationsByKey.put(r.getSbn().getKey(), r);















            if (r.getSbn().isGroup()) {















                mSummaryByGroupKey.put(r.getGroupKey(), r);















            }















        }













    }





























    @VisibleForTesting















    void addEnqueuedNotification(NotificationRecord r) {













        synchronized (mNotificationLock) {















            mEnqueuedNotifications.add(r);















        }













    }





























    @VisibleForTesting















    NotificationRecord getNotificationRecord(String key) {













        synchronized (mNotificationLock) {















            return mNotificationsByKey.get(key);















        }













    }





























    @VisibleForTesting















    void setHandler(WorkerHandler handler) {