Merge "avoid stopping app in case of accessing empty db"
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index fa05035..f9b1e58 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -470,8 +470,14 @@
}
SQLiteDatabase db = mOpenHelper.getReadableDatabase();
- Cursor ret = qb.query(db, projectionIn, selection, selectionArgs, null, null, sort);
- ret.setNotificationUri(getContext().getContentResolver(), url);
+ Cursor ret = null;
+ try {
+ ret = qb.query(db, projectionIn, selection, selectionArgs, null, null, sort);
+ } catch (SQLException e) {
+ Log.e(TAG, "got exception when querying: " + e);
+ }
+ if (ret != null)
+ ret.setNotificationUri(getContext().getContentResolver(), url);
return ret;
}
@@ -736,7 +742,11 @@
private void restoreDefaultAPN() {
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
- db.delete(CARRIERS_TABLE, null, null);
+ try {
+ db.delete(CARRIERS_TABLE, null, null);
+ } catch (SQLException e) {
+ Log.e(TAG, "got exception when deleting to restore: " + e);
+ }
setPreferredApnId((long)-1);
mOpenHelper.initDatabase(db);
}