am a2e1cebe: Merge "Fix fallback for emergency calls" into lmp-mr1-dev (290c7379) · Commits · e / os / android_packages_services_Telecomm

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

+12 −9

Original line number	Diff line number	Diff line
		@@ -392,7 +392,18 @@ final class Call implements CreateConnectionResponse {
		void setState(int newState) {
		if (mState != newState) {
		Log.v(this, "setState %s -> %s", mState, newState);
		int oldState = mState;

		if (newState == CallState.DISCONNECTED
		&& (mState == CallState.DIALING \|\| mState == CallState.CONNECTING)
		&& mCreateConnectionProcessor != null
		&& mCreateConnectionProcessor.isProcessingComplete()
		&& mCreateConnectionProcessor.hasMorePhoneAccounts()
		&& mDisconnectCause != null
		&& mDisconnectCause.getCode() == DisconnectCause.ERROR) {
		mCreateConnectionProcessor.continueProcessingIfPossible(this, mDisconnectCause);
		return;
		}

		mState = newState;
		maybeLoadCannedSmsResponses();

		@@ -410,14 +421,6 @@ final class Call implements CreateConnectionResponse {
		mDisconnectTimeMillis = System.currentTimeMillis();
		setLocallyDisconnecting(false);
		fixParentAfterDisconnect();
		if ((oldState == CallState.DIALING \|\| oldState == CallState.CONNECTING)
		&& mCreateConnectionProcessor != null
		&& mCreateConnectionProcessor.isProcessingComplete()
		&& mCreateConnectionProcessor.hasMorePhoneAccounts()
		&& mDisconnectCause != null
		&& mDisconnectCause.getCode() == DisconnectCause.ERROR) {
		mCreateConnectionProcessor.continueProcessingIfPossible(this, mDisconnectCause);
		}
		}
		}
		}