commit 478899e1c9ecdc011b99f86a3b78013455ddb20f
author Tyler Gunn <tgunn@google.com> Tue Apr 18 15:33:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 18 15:33:24 2017 +0000
tree 6c67a9df95edaca145b80951f114d09051a998e6
parent 1b2628d1fc810656082f32409911ef7072d59a32
parent 1329e4fb6bf52d5a7e372bee30f07ea7e0833dd4

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

Change-Id: Id188787eb006b2f861e08529de8df92fbc7d833a

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;