commit f596d654b5e0c392a42facb0fad62706399cc21a
author Amit Mahajan <amitmahajan@google.com> Mon Nov 09 13:20:21 2015 -0800
committer The Android Automerger <android-build@google.com> Mon Nov 09 17:01:07 2015 -0800
tree 746132bdd8ae169add10c9bbf98a680afe23208f
parent d4091e0fbb8cd6f549a431ae471749a2ad86008c

Try-catch for deletePreferredApnId()

Devices pre-dating lollipop have pref apn stored in shared pref
without sub id. That shared pref was removed in M, but devices
skipping M will run into this crash on trying to extract sub id
from the pref apn key.

Bug: 25587618
Change-Id: I5a7727acd390fe861a8bb71a0a6eab8246791c59

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 bf7dc74..bf77aec 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1453,10 +1453,14 @@
         Map<String, ?> allPrefApnId = sp.getAll();
         for (String key : allPrefApnId.keySet()) {
             // extract subId from key by removing COLUMN_APN_ID
-            int subId = Integer.parseInt(key.replace(COLUMN_APN_ID, ""));
-            long apnId = getPreferredApnId(subId, false);
-            if (apnId != INVALID_APN_ID) {
-                setPreferredApn(apnId, subId);
+            try {
+                int subId = Integer.parseInt(key.replace(COLUMN_APN_ID, ""));
+                long apnId = getPreferredApnId(subId, false);
+                if (apnId != INVALID_APN_ID) {
+                    setPreferredApn(apnId, subId);
+                }
+            } catch (Exception e) {
+                loge("Skipping over key " + key + " due to exception " + e);
             }
         }
         SharedPreferences.Editor editor = sp.edit();