commit 19d814b12a6ba77ba93ee5d8f3b46ca979d8e5ca
author Santos Cordon <santoscordon@google.com> Wed Aug 28 14:58:17 2013 -0700
committer Santos Cordon <santoscordon@google.com> Wed Aug 28 14:58:17 2013 -0700
tree 0eaf04a91f31ddb4cda4ef2d0028f0954d685a38
parent dfc77d88ca5aef745f56d1e8af283dfa15851025

fixing merge conflict

Change-Id: I73593c2c0cc98fb7cd7a758b21bc8004b663ecaa

src/com/android/phone/CallHandlerServiceProxy.java

diff --git a/src/com/android/phone/CallHandlerServiceProxy.java b/src/com/android/phone/CallHandlerServiceProxy.java
index 27a99fd..3f38615 100644
--- a/src/com/android/phone/CallHandlerServiceProxy.java
+++ b/src/com/android/phone/CallHandlerServiceProxy.java
@@ -228,18 +228,18 @@
                 setupServiceConnection();
             }
         }
-    }
-
-    ;
+    };
 
     public void bringToForeground() {
         // only support this call if the service is already connected.
-        if (mCallHandlerService != null && mCallModeler.hasLiveCall()) {
-            try {
-                if (DBG) Log.d(TAG, "bringToForeground");
-                mCallHandlerService.bringToForeground();
-            } catch (RemoteException e) {
-                Log.e(TAG, "Exception handling bringToForeground", e);
+        synchronized (mServiceAndQueueLock) {
+            if (mCallHandlerServiceGuarded != null && mCallModeler.hasLiveCall()) {
+                try {
+                    if (DBG) Log.d(TAG, "bringToForeground");
+                    mCallHandlerServiceGuarded.bringToForeground();
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Exception handling bringToForeground", e);
+                }
             }
         }
     }