Merge "Changing RuntimeException on old-apns-conf file not found to error msg." am: 3ad0b41cfc
am: 4c08dfe31b
* commit '4c08dfe31bbea31cec06b031a5dede409813b0de':
Changing RuntimeException on old-apns-conf file not found to error msg.
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index bf77aec..0137237 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -663,12 +663,11 @@
} catch (FileNotFoundException e) {
// This function is called only when upgrading db to version 15. Details about the
// upgrade are mentioned in onUpgrade(). This file missing means user/carrier added
- // APNs cannot be preserved. Throw an exception so that OEMs know they need to
+ // APNs cannot be preserved. Log an error message so that OEMs know they need to
// include old apns file for comparison.
- loge("preserveUserAndCarrierApns: FileNotFoundException");
- throw new RuntimeException("preserveUserAndCarrierApns: " + OLD_APNS_PATH +
- " not found. It is needed to upgrade from older versions of APN " +
- "db while preserving user/carrier added/edited entries.");
+ loge("PRESERVEUSERANDCARRIERAPNS: " + OLD_APNS_PATH +
+ " NOT FOUND. IT IS NEEDED TO UPGRADE FROM OLDER VERSIONS OF APN " +
+ "DB WHILE PRESERVING USER/CARRIER ADDED/EDITED ENTRIES.");
} catch (Exception e) {
loge("preserveUserAndCarrierApns: Exception while parsing '" +
confFile.getAbsolutePath() + "'" + e);