From 2553f667bb1bc18bd7fcf55b7cbbea1f2c922769 Mon Sep 17 00:00:00 2001 From: Yuichiro Hanada Date: Mon, 3 Apr 2023 23:29:34 +0900 Subject: [PATCH] Use the correct object to guard |mConversationsListeners| The variable is marked as @GuardedBy("mLock"), but actually guarded by itself. Bug: 276714246 Test: m (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cae843c3878eff70ae223c3e22b19558cb594b04) Merged-In: I383e6c42f16f747dd80d604671b369fa491376cb Change-Id: I383e6c42f16f747dd80d604671b369fa491376cb --- .../people/java/com/android/server/people/data/DataManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/people/java/com/android/server/people/data/DataManager.java b/services/people/java/com/android/server/people/data/DataManager.java index 54d2c194e63a3..db84b6c4a17d0 100644 --- a/services/people/java/com/android/server/people/data/DataManager.java +++ b/services/people/java/com/android/server/people/data/DataManager.java @@ -1339,7 +1339,7 @@ public class DataManager { /** Adds {@code listener} to be notified on conversation changes. */ public void addConversationsListener( @NonNull PeopleService.ConversationsListener listener) { - synchronized (mConversationsListeners) { + synchronized (mLock) { mConversationsListeners.add(Objects.requireNonNull(listener)); } }