PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2022-05-23 10:21:02 +00:00
committed by Gerrit Code Review
parent 27b4578002 6f1b6e3693
commit 97b4621c68
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/homepage/contextualcards/CardContentProvider.java
View File

@@ -65,11 +65,8 @@ public class CardContentProvider extends ContentProvider {
URI_MATCHER.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS); URI_MATCHER.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS);
} }
private CardDatabaseHelper mDBHelper;
@Override @Override
public boolean onCreate() { public boolean onCreate() {
mDBHelper = CardDatabaseHelper.getInstance(getContext());
return true; return true;
} }
@@ -84,7 +81,8 @@ public class CardContentProvider extends ContentProvider {
public int bulkInsert(Uri uri, ContentValues[] values) { public int bulkInsert(Uri uri, ContentValues[] values) {
final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy(); final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
int numInserted = 0; int numInserted = 0;
final SQLiteDatabase database = mDBHelper.getWritableDatabase(); final CardDatabaseHelper DBHelper = CardDatabaseHelper.getInstance(getContext());
final SQLiteDatabase database = DBHelper.getWritableDatabase();
final boolean keepDismissalTimestampBeforeDeletion = getContext().getResources() final boolean keepDismissalTimestampBeforeDeletion = getContext().getResources()
.getBoolean(R.bool.config_keep_contextual_card_dismissal_timestamp); .getBoolean(R.bool.config_keep_contextual_card_dismissal_timestamp);
final Map<String, Long> dismissedTimeMap = new ArrayMap<>(); final Map<String, Long> dismissedTimeMap = new ArrayMap<>();
@@ -168,7 +166,8 @@ public class CardContentProvider extends ContentProvider {
final SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder(); final SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
final String table = getTableFromMatch(uri); final String table = getTableFromMatch(uri);
queryBuilder.setTables(table); 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, final Cursor cursor = queryBuilder.query(database,
projection, selection, selectionArgs, null /* groupBy */, null /* having */, projection, selection, selectionArgs, null /* groupBy */, null /* having */,
sortOrder); sortOrder);