Merge "Prevent dial() return null in a racing condition."

Author: John Huang

telephony/java/com/android/internal/telephony/gsm/GsmCallTracker.java

@@ -167,7 +167,7 @@ public void unregisterForVoiceCallEnded(Handler h) {
     /**
      * clirMode is one of the CLIR_ constants
      */
-    Connection
+    synchronized Connection
     dial (String dialString, int clirMode, UUSInfo uusInfo) throws CallStateException {
         // note that this triggers call state changed notif
         clearDisconnected();
@@ -406,7 +406,7 @@ public void unregisterForVoiceCallEnded(Handler h) {
         }
     }
 
-    protected void
+    protected synchronized void
     handlePollCalls(AsyncResult ar) {
         List polledCalls;