commit 9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 12:32:01 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 12:32:01 2013 -0700
tree 757dc2af69c8a2fabf997cb654384c102a22135d
parent c93d3b14259cd00a9d7f92e3e2dd4d9992fca94e
parent eb69ddd4db1f1a421f1d27e1d42d557f0897f08e

am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eb69ddd4db1f1a421f1d27e1d42d557f0897f08e':

src/java/com/android/internal/telephony/gsm/GsmConnection.java

diff --git a/src/java/com/android/internal/telephony/gsm/GsmConnection.java b/src/java/com/android/internal/telephony/gsm/GsmConnection.java
index 59aa12a..875b680 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmConnection.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmConnection.java
@@ -373,11 +373,10 @@
             default:
                 GSMPhone phone = owner.phone;
                 int serviceState = phone.getServiceState().getState();
-                UiccCardApplication cardApp = UiccController
+                AppState uiccAppState = UiccController
                         .getInstance()
-                        .getUiccCardApplication(UiccController.APP_FAM_3GPP);
-                AppState uiccAppState = (cardApp != null) ? cardApp.getState() :
-                                                            AppState.APPSTATE_UNKNOWN;
+                        .getUiccCardApplication(UiccController.APP_FAM_3GPP)
+                        .getState();
                 if (serviceState == ServiceState.STATE_POWER_OFF) {
                     return DisconnectCause.POWER_OFF;
                 } else if (serviceState == ServiceState.STATE_OUT_OF_SERVICE