Add null check for original telephony connection before closing.
Bug: 263418052
Test: Manual video call testing
Change-Id: I8dcb798398bbe0f47a223c05beb1af7f667e51ff
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 4952596..a5be6c3 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -602,18 +602,21 @@
// code from original connection.
com.android.internal.telephony.Connection connection =
mNormalCallConnection.getOriginalConnection();
- if (cause == android.telephony.DisconnectCause.NOT_VALID) {
- cause = connection.getDisconnectCause();
+ if (connection != null) {
+ if (cause == android.telephony.DisconnectCause.NOT_VALID) {
+ cause = connection.getDisconnectCause();
+ }
+
+ String reason = connection.getVendorDisconnectCause();
+
+ mNormalCallConnection.setTelephonyConnectionDisconnected(
+ mDisconnectCauseFactory.toTelecomDisconnectCause(
+ cause, reason));
+ Log.d(this, "Call connection closed. Cause: " + cause
+ + " Reason: " + reason);
}
-
- String reason = connection.getVendorDisconnectCause();
- mNormalCallConnection.setTelephonyConnectionDisconnected(
- mDisconnectCauseFactory.toTelecomDisconnectCause(cause, reason));
-
mNormalCallConnection.close();
mNormalCallConnection = null;
- Log.d(this, "Call connection closed. Cause: " + cause
- + " Reason: " + reason);
}
}