Merge "Prevent dial() return null in a racing condition." (fd400f5f) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ public final class GsmCallTracker extends CallTracker {
		/**
		* 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 final class GsmCallTracker extends CallTracker {
		}
		}

		protected void
		protected synchronized void
		handlePollCalls(AsyncResult ar) {
		List polledCalls;