commit 23eb57a66a1842064348c5cdb858f8b2e2e261c5
author Sanket Agarwal <sanketa@google.com> Wed Jun 15 13:11:37 2016 -0700
committer Sanket Agarwal <sanketa@google.com> Wed Jun 15 13:11:37 2016 -0700
tree e2969ee52169f4285a93831e45fef55432a6e3dc
parent 62cc9e6afa305ec650e709fe72a687e26cf0b1c1

Synchronize onCallAdded with onCallRemoved.

In cases of very quick call and hangup we can sometimes get call
disconnected (and onCallRemoved) status chagned before we get
onCallAdded. This is because onCallAdded currently does not hold the
lock.

Bug: b/28969591
Change-Id: Ic2f291dff9dd61c54b1ada3b21c61e24bca65ebc

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index e5a9bac..0a14ffb 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -84,27 +84,31 @@
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
                 Log.startSession("ICSBC.oSC");
-                try {
-                    Log.d(this, "onServiceConnected: %s %b %b", name, mIsBound, mIsConnected);
-                    mIsBound = true;
-                    if (mIsConnected) {
-                        // Only proceed if we are supposed to be connected.
-                        onConnected(service);
+                synchronized (mLock) {
+                    try {
+                        Log.d(this, "onServiceConnected: %s %b %b", name, mIsBound, mIsConnected);
+                        mIsBound = true;
+                        if (mIsConnected) {
+                            // Only proceed if we are supposed to be connected.
+                            onConnected(service);
+                        }
+                    } finally {
+                        Log.endSession();
                     }
-                } finally {
-                    Log.endSession();
                 }
             }
 
             @Override
             public void onServiceDisconnected(ComponentName name) {
                 Log.startSession("ICSBC.oSD");
-                try {
-                    Log.d(this, "onDisconnected: %s", name);
-                    mIsBound = false;
-                    onDisconnected();
-                } finally {
-                    Log.endSession();
+                synchronized (mLock) {
+                    try {
+                        Log.d(this, "onDisconnected: %s", name);
+                        mIsBound = false;
+                        onDisconnected();
+                    } finally {
+                        Log.endSession();
+                    }
                 }
             }
         };