commit 71f4ea323751c09bfce7e5a917ec568623a6ea9e
author fionaxu <fionaxu@google.com> Wed May 03 11:46:54 2017 -0700
committer gitbuildkicker <android-build@google.com> Wed May 03 19:27:45 2017 -0700
tree 7018dfd4397f2c140978eefd3f5c8158babd7231
parent 52c21c165218f39a74df6623edf77ab7cbb86f49

fix crash from carriersignalAgent under sip call

Bug: 37917990
Test: Manual test with sip call
Change-Id: Ia6d74928655d60d35062e6a8e920788759d99efd
(cherry picked from commit d2569726c9c5a93c852ec6ddd5ca80c760845061)

src/java/com/android/internal/telephony/CarrierSignalAgent.java

diff --git a/src/java/com/android/internal/telephony/CarrierSignalAgent.java b/src/java/com/android/internal/telephony/CarrierSignalAgent.java
index 72da030..4d6d464 100644
--- a/src/java/com/android/internal/telephony/CarrierSignalAgent.java
+++ b/src/java/com/android/internal/telephony/CarrierSignalAgent.java
@@ -101,7 +101,8 @@
             if (DBG) log("CarrierSignalAgent receiver action: " + action);
             if (action.equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {
                 // notify carrier apps before cache get purged
-                if (IccCardConstants.State.ABSENT == mPhone.getIccCard().getState()) {
+                if (mPhone.getIccCard() != null
+                        && IccCardConstants.State.ABSENT == mPhone.getIccCard().getState()) {
                     notifyCarrierSignalReceivers(
                             new Intent(TelephonyIntents.ACTION_CARRIER_SIGNAL_RESET));
                 }