commit c42c3cfe64ddba8de4b5d591ab12e9f2a4c08116
author Linux Build Service Account <lnxbuild@localhost> Mon Nov 07 10:39:03 2016 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Nov 07 10:39:03 2016 -0700
tree a33b414718cc8740caaee53efa10d40558e967c0
parent efada0548275ff7702450a74b5f9fc429190fc51
parent 32ec5b37420b006ddbd73eac7ac3ad530b39b1d1

Merge 32ec5b37420b006ddbd73eac7ac3ad530b39b1d1 on remote branch

Change-Id: I0441ae11e17603ed97053fb24dbaa087967cc9a4

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;
         }