commit 89ec5fe8dab48878de434301060d2281f3b951b9
author Sean Midford <midfords@google.com> Wed Nov 23 00:36:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 23 00:36:12 2016 +0000
tree c2b159eb604249cfcc51b82840b5e1865a22f54f
parent f4561bc935a1a50154dad97ef106c3950086dbb7
parent c2deb410ad00762b857a0089ea71cfdd2b116ca7

Silence SQLiteExceptions thrown by providers
am: c2deb410ad

Change-Id: Ieb76645bc2a57e0dd8b39ba14a7503a681c88089

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