Fix NPE while handling 380 response
Bug: 277040167
Test: manual with MD8475
Change-Id: Ieee6925a243ca8576018da9a37a257564f1298ed
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 1852ed7..7c30bff 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -553,7 +553,11 @@
@Override
public void onOriginalConnectionConfigured(TelephonyConnection c) {
com.android.internal.telephony.Connection origConn = c.getOriginalConnection();
- if (origConn == null) return;
+ if ((origConn == null) || (mEmergencyStateTracker == null)) {
+ // mEmergencyStateTracker is null when no emergency call has been dialed
+ // after bootup and normal call fails with 380 response.
+ return;
+ }
// Update the domain in the case that it changes,for example during initial
// setup or when there was an srvcc or internal redial.
mEmergencyStateTracker.onEmergencyCallDomainUpdated(