commit b88585bbb8e48c1ab75f029decd164b1003b5e58
author Amit Mahajan <amitmahajan@google.com> Mon Nov 09 21:35:25 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 09 21:35:25 2015 +0000
tree 6d7cc9d4b0161e693ccd7988960e85b119c30e6e
parent 9b0e36e7a2bad6951d984f853cf96e59657006cd
parent 7f1fc5e58ed9b4cf22b91f440548c6f8a23415a4

Try-catch for deletePreferredApnId() am: cecbabcec6
am: 7f1fc5e58e

* commit '7f1fc5e58ed9b4cf22b91f440548c6f8a23415a4':
  Try-catch for deletePreferredApnId()

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();