commit 775f100b20a5c978bc07f621a4087f79b1f73e3f
author Wink Saville <wink@google.com> Wed Jun 25 10:17:49 2014 -0700
committer Wink Saville <wink@google.com> Wed Jun 25 18:19:03 2014 +0000
tree 1944f70196500d187c3b2c19e96a7a76fc2d94a9
parent 91483068442750265a04f2ea25f7f30f261be6bc

Fix NPE caused by null mUiccApplication.

Bug: 15712558
Change-Id: Ieb35fa69d8002286e54e6f5d8e73e057300ae94c

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index e80d18b..91c5de6 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -46,6 +46,7 @@
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

src/java/com/android/internal/telephony/uicc/IccCardProxy.java

diff --git a/src/java/com/android/internal/telephony/uicc/IccCardProxy.java b/src/java/com/android/internal/telephony/uicc/IccCardProxy.java
index 134b02f..ff2e7a8 100644
--- a/src/java/com/android/internal/telephony/uicc/IccCardProxy.java
+++ b/src/java/com/android/internal/telephony/uicc/IccCardProxy.java
@@ -391,6 +391,7 @@
 
         if (mUiccApplication == null) {
             setExternalState(State.NOT_READY);
+            return;
         }
 
         switch (mUiccApplication.getState()) {