commit 32ec5b37420b006ddbd73eac7ac3ad530b39b1d1
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 31 21:16:47 2016 -0600
committer Linux Build Service Account <lnxbuild@localhost> Mon Oct 31 21:16:47 2016 -0600
tree a33b414718cc8740caaee53efa10d40558e967c0
parent 1d22bfc5c74c76a67b1064204be1d1222312a303
parent 3886155e5bff107ac20148637d6434f168a81d50

Promotion of android_ui.lnx.2.1.c1-00004.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1081933   Ie94468b678c2a75aa41c5d3a8f5f32ccc7a03afa   Fix NPE for restoring default APN

Change-Id: I9706f8989984ee729ea9609d383b2194e5e3635a
CRs-Fixed: 1081933

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index cec7e81..c36bd1b 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2258,7 +2258,7 @@
             where = where + "edited=" + USER_EDITED + ")";
         }
 
-        if (simCountWithSameNumeric == subInfoList.size() - 1) {
+        if (subInfoList != null && simCountWithSameNumeric == subInfoList.size() - 1) {
             //Reset where as all slots have same sims
             where = null;
         }