diff options
| author | 2024-11-22 20:23:59 +0000 | |
|---|---|---|
| committer | 2024-11-22 20:23:59 +0000 | |
| commit | ab7185a3dc205bc204681741f6866862584eeec2 (patch) | |
| tree | aea2cbcbde446b84b9545a0cdb25ab26baacf70f | |
| parent | 06bbda7d7586b1eed3c8654938143902ca2b2501 (diff) | |
| parent | 54fb353080c42683b9bbe29f064e20bd602a946d (diff) | |
Merge "WatchableImpl: add lock when get the mObservers size." into main am: 54fb353080
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3372057
Change-Id: Ib7a4ab094ac0987147b57a973f772d89a5497549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/utils/WatchableImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/utils/WatchableImpl.java b/services/core/java/com/android/server/utils/WatchableImpl.java index 8a04ccf2dbc6..fec435154c83 100644 --- a/services/core/java/com/android/server/utils/WatchableImpl.java +++ b/services/core/java/com/android/server/utils/WatchableImpl.java @@ -33,6 +33,7 @@ public class WatchableImpl implements Watchable { /** * The list of observers. */ + @GuardedBy("mObservers") protected final ArrayList<Watcher> mObservers = new ArrayList<>(); /** @@ -83,7 +84,9 @@ public class WatchableImpl implements Watchable { * @return The number of registered observers. */ public int registeredObserverCount() { - return mObservers.size(); + synchronized (mObservers) { + return mObservers.size(); + } } /** |