am 10f1c6a9: Modified PhoneUtils.java to move call to setGatewayInfoForConnection inside a code block that appropriately checks for null, as required. b/12210645
* commit '10f1c6a97074b981b08bb804a3568c17ec3890a5':
Modified PhoneUtils.java to move call to setGatewayInfoForConnection inside a code block that appropriately checks for null, as required. b/12210645
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index d3a8da5..69a7995 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -723,11 +723,6 @@
// we dialed an MMI (see below).
}
- // Now that the call is successful, we can save the gateway info for the call
- if (callGateway != null) {
- callGateway.setGatewayInfoForConnection(connection, gatewayInfo);
- }
-
int phoneType = phone.getPhoneType();
// On GSM phones, null is returned for MMI codes
@@ -739,6 +734,11 @@
status = CALL_STATUS_FAILED;
}
} else {
+ // Now that the call is successful, we can save the gateway info for the call
+ if (callGateway != null) {
+ callGateway.setGatewayInfoForConnection(connection, gatewayInfo);
+ }
+
if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
updateCdmaCallStateOnNewOutgoingCall(app, connection);
}