Merge "Do not update state of Disconnected Connection" into nyc-dev am: 764e856
am: e01a0a7
* commit 'e01a0a73957a9385e3945cd02fb3093bf4d46211':
Do not update state of Disconnected Connection
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 6ab1f6b..8f6c57e 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -940,6 +940,9 @@
}
void updateStateInternal() {
+ if (mOriginalConnection == null) {
+ return;
+ }
Call.State newState;
// If the state is overridden and the state of the original connection hasn't changed since,
// then we continue in the overridden state, else we go to the original connection's state.