| commit | 9294b2a80c6b34b898c0f38f4c1ef3f0abf214d0 | [log] [tgz] |
|---|---|---|
| author | Mengjun, Leng <mengju@codeaurora.org> | Tue Oct 25 18:29:18 2016 +0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Oct 26 01:41:07 2016 -0700 |
| tree | a33b414718cc8740caaee53efa10d40558e967c0 | |
| parent | ac2d27c9c7abef7e1ff140bdbe835dfc2c17c66c [diff] |
Fix NPE for restoring default APN Add null check for subInfoList to avoid crash in corner case. Change-Id: Ie94468b678c2a75aa41c5d3a8f5f32ccc7a03afa CRs-Fixed: 1081933
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; }