Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2deb410 authored by Sean Midford's avatar Sean Midford
Browse files

Silence SQLiteExceptions thrown by providers 

Added catch to silence sqlexceptions from crashing
the app and logging silent feedback. Based on crash reports
this seemed to happen because some OEMs removed contact_presence
column in cp2.

Test: Manually threw SQLiteException to test behavior
and verified app is stable.

Bug: 32943841

Change-Id: I1b52b608f5dcb9275b33945281392dae9c83a20b
parent 2b2cbe9c

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;

    }