diff options
| author | Wink Saville <wink@google.com> | 2012-09-25 12:26:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-25 12:26:10 -0700 |
| commit | f0b6e3ed7881f0a92281684e70c6249d0898338c (patch) | |
| tree | c8a6779ff423b15c15c066b509df3dd675498004 | |
| parent | 7b5e41b5aca925ef476bf670a1f65f1cb51bac83 (diff) | |
| parent | 5607e47cac5ac23459539bbb6f75e2507d4e03b7 (diff) | |
| download | telephony-tools_r21.tar.gz | |
am 5607e47c: Merge "Telephony: Fix npe when making a call after ejecting card"tools_r21
* commit '5607e47cac5ac23459539bbb6f75e2507d4e03b7':
Telephony: Fix npe when making a call after ejecting card
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GsmConnection.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GsmConnection.java b/src/java/com/android/internal/telephony/gsm/GsmConnection.java index 875b680dc8..59aa12a6f7 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmConnection.java +++ b/src/java/com/android/internal/telephony/gsm/GsmConnection.java @@ -373,10 +373,11 @@ public class GsmConnection extends Connection { default: GSMPhone phone = owner.phone; int serviceState = phone.getServiceState().getState(); - AppState uiccAppState = UiccController + UiccCardApplication cardApp = UiccController .getInstance() - .getUiccCardApplication(UiccController.APP_FAM_3GPP) - .getState(); + .getUiccCardApplication(UiccController.APP_FAM_3GPP); + AppState uiccAppState = (cardApp != null) ? cardApp.getState() : + AppState.APPSTATE_UNKNOWN; if (serviceState == ServiceState.STATE_POWER_OFF) { return DisconnectCause.POWER_OFF; } else if (serviceState == ServiceState.STATE_OUT_OF_SERVICE |