commit cfdb743efa6b0cb5aafaaafbc7687ae41d761d65
author Hyejin Kim <hyejin.kim@lge.com> Sat Feb 16 00:58:37 2013 +0900
committer Sungmin Choi <sungmin.choi@lge.com> Sat Feb 16 01:04:37 2013 +0900
tree 8daff4fbbde7f2dddb6422bd42c6295454b66fbf
parent 16117fa197f7dccb73ad7f710cb6e09f1abef20a

avoid stopping app in case of accessing empty db

Empty database is made by exception for loading apns.
When accessing empty database, Setting App is stopped, sometimes.
To avoid stopping app, check null if occuring SQLException

Change-Id: I36e6676c54bd8b182fb16f896e04b8e051d3bf2d

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