commit bf925845027f471ead845417ded90686c836cac4
author Wink Saville <wink@google.com> Thu Feb 21 15:19:29 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 21 15:19:29 2013 -0800
tree 6eb32c7a9ca9ed3d5f250abce042b8316764f78f
parent 7ab2b8c5d6a5a830df3881237563f742a603a3d8
parent a4ea7c9d0811080d318cdd712582038a91699459

am a4ea7c9d: am 69dff541: Merge "avoid stopping app in case of accessing empty db"

* commit 'a4ea7c9d0811080d318cdd712582038a91699459':
  avoid stopping app in case of accessing empty db

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