commit abcbce4441720c52a443d292d5adc2d95f446494
author Ihab Awad <ihab@google.com> Tue Apr 07 14:04:01 2015 -0700
committer Ihab Awad <ihab@google.com> Thu Apr 09 16:17:02 2015 -0700
tree 4768b7efaed961bed127cdf8a844d6f409515d8c
parent 5a1b1fde1fb0e473c814ad13cc43d06f4e32ff5a

Fix deadlock around locking in AudioManager

Includes proof of concept tests, but the tests are not yet
highlighting the problem, due to its nondeterminism.

Bug: 20103143
Bug: 20108354
Change-Id: I8323a660c6cc4093888f4e608070709a828624e6

src/com/android/server/telecom/ContactsAsyncHelper.java

diff --git a/src/com/android/server/telecom/ContactsAsyncHelper.java b/src/com/android/server/telecom/ContactsAsyncHelper.java
index ef7ea4c..44fa654 100644
--- a/src/com/android/server/telecom/ContactsAsyncHelper.java
+++ b/src/com/android/server/telecom/ContactsAsyncHelper.java
@@ -127,12 +127,12 @@
                             }
                         }
                     }
-                    synchronized (mLock) {
-                        Log.d(this, "Notifying listener: " + args.listener.toString() +
-                                " image: " + args.displayPhotoUri + " completed");
-                        args.listener.onImageLoadComplete(msg.what, args.photo, args.photoIcon,
+
+                    // Listener will synchronize as needed
+                    Log.d(this, "Notifying listener: " + args.listener.toString() +
+                            " image: " + args.displayPhotoUri + " completed");
+                    args.listener.onImageLoadComplete(msg.what, args.photo, args.photoIcon,
                                 args.cookie);
-                    }
                     break;
                 default:
                     break;