commit 3886155e5bff107ac20148637d6434f168a81d50
author Mengjun, Leng <mengju@codeaurora.org> Tue Oct 25 18:29:18 2016 +0800
committer Mengjun, Leng <mengju@codeaurora.org> Tue Oct 25 18:33:59 2016 +0800
tree a33b414718cc8740caaee53efa10d40558e967c0
parent 1d22bfc5c74c76a67b1064204be1d1222312a303

Fix NPE for restoring default APN

Add null check for subInfoList to avoid crash in corner case.

Change-Id: Ie94468b678c2a75aa41c5d3a8f5f32ccc7a03afa
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;
         }