commit e31b757d3a1ce6d5d8fe53dea032bf50e3739cf9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 23 02:14:19 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 23 02:14:19 2016 +0000
tree 41ae2b3ad7c20d819d32f41414f1f5f6864a8f2d
parent 34229656107dcedd3068ecc964041445eb7e3f47
parent d3bf8fc52b63e729b2e38ecfc96a7f0e42128175

Merge "Changed layout of dialogs for a11y" into ub-contactsdialer-h-dev

src/com/android/contacts/common/list/FavoritesAndContactsLoader.java

diff --git a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java b/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
index 422cf7c..25dd711 100644
--- a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
+++ b/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
@@ -19,6 +19,7 @@
 import android.content.CursorLoader;
 import android.database.Cursor;
 import android.database.MergeCursor;
+import android.database.sqlite.SQLiteException;
 import android.os.Bundle;
 import android.provider.ContactsContract.Contacts;
 
@@ -73,8 +74,9 @@
         // correctly handles null cursors.
         try {
             return super.loadInBackground();
-        } catch (NullPointerException | SecurityException e) {
-            // Ignore NPEs and SecurityExceptions thrown by providers
+
+        } catch (NullPointerException | SQLiteException | SecurityException e) {
+            // Ignore NPEs, SQLiteExceptions and SecurityExceptions thrown by providers
         }
         return null;
     }