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

Commit 4b8ffaca authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate"... 

Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c am: 2b7eb9ef am: 38f8c617 am: fe163094

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158



Change-Id: I2368c602b04e7f0dbc123b2b2c258147054a893b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4de260a1 fe163094

src/com/android/settings/homepage/contextualcards/CardContentProvider.java

+4 −5
Original line number Diff line number Diff line
@@ -65,11 +65,8 @@ public class CardContentProvider extends ContentProvider { 
        URI_MATCHER.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS);

    }



    private CardDatabaseHelper mDBHelper;



    @Override

    public boolean onCreate() {

        mDBHelper = CardDatabaseHelper.getInstance(getContext());

        return true;

    }
@@ -84,7 +81,8 @@ public class CardContentProvider extends ContentProvider { 
    public int bulkInsert(Uri uri, ContentValues[] values) {

        final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();

        int numInserted = 0;

        final SQLiteDatabase database = mDBHelper.getWritableDatabase();

        final CardDatabaseHelper DBHelper = CardDatabaseHelper.getInstance(getContext());

        final SQLiteDatabase database = DBHelper.getWritableDatabase();

        final boolean keepDismissalTimestampBeforeDeletion = getContext().getResources()

                .getBoolean(R.bool.config_keep_contextual_card_dismissal_timestamp);

        final Map<String, Long> dismissedTimeMap = new ArrayMap<>();
@@ -168,7 +166,8 @@ public class CardContentProvider extends ContentProvider { 
            final SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();

            final String table = getTableFromMatch(uri);

            queryBuilder.setTables(table);

            final SQLiteDatabase database = mDBHelper.getReadableDatabase();

            final CardDatabaseHelper DBHelper = CardDatabaseHelper.getInstance(getContext());

            final SQLiteDatabase database = DBHelper.getReadableDatabase();

            final Cursor cursor = queryBuilder.query(database,

                    projection, selection, selectionArgs, null /* groupBy */, null /* having */,

                    sortOrder);