commit 1bdb02dc58a559c2f8182baefe92cdee8f85945a
author Tyler Gunn <tgunn@google.com> Tue Apr 18 15:39:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 18 15:39:25 2017 +0000
tree beca4633ae0e21e1b5beea4b6e1282ed3214b4fa
parent aa4f90b0912d95e605671f2f868177a782265b53
parent 478899e1c9ecdc011b99f86a3b78013455ddb20f

Merge "Make thread safe when accessing AccountEntry" am: 1329e4fb6b
am: 478899e1c9

Change-Id: I3e564e629e26c9a06cb076496ab1600c695255c9

src/com/android/services/telephony/TelecomAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 02cd2c4..bf927fc 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -621,9 +621,11 @@
      * @return {@code True} if merging IMS calls is supported.
      */
     boolean isMergeImsCallSupported(PhoneAccountHandle handle) {
-        for (AccountEntry entry : mAccounts) {
-            if (entry.getPhoneAccountHandle().equals(handle)) {
-                return entry.isMergeImsCallSupported();
+        synchronized (mAccountsLock) {
+            for (AccountEntry entry : mAccounts) {
+                if (entry.getPhoneAccountHandle().equals(handle)) {
+                    return entry.isMergeImsCallSupported();
+                }
             }
         }
         return false;