Merge "Silence SQLiteExceptions thrown by providers" into ub-contactsdialer-h-dev (34229656) · Commits · e / os / android_packages_apps_Contacts

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.content.Context;
		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 @@ public class FavoritesAndContactsLoader extends CursorLoader {
		// 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;
		}