aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing static Context access using LauncherAppState

Browse Source 
> This ensures that LauncherAppState is only accessed in the presence of
a valid context

Bug: 33032833
Change-Id: I955e5cb022f8bd6374681ae6c0720a2666d5b750
This commit is contained in:
Sunny Goyal
2017-01-11 10:48:34 -08:00
parent 4130705141
commit 87f784c285
34 changed files with 117 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/util/ContentWriter.java
View File

@@ -93,9 +93,9 @@ public class ContentWriter {
* Commits any pending validation and returns the final values.
* Must not be called on UI thread.
*/
public ContentValues getValues() {
public ContentValues getValues(Context context) {
Preconditions.assertNonUiThread();
if (mIcon != null && !LauncherAppState.getInstance().getIconCache()
if (mIcon != null && !LauncherAppState.getInstance(context).getIconCache()
.isDefaultIcon(mIcon, mUser)) {
mValues.put(LauncherSettings.Favorites.ICON, Utilities.flattenBitmap(mIcon));
mIcon = null;
@@ -105,7 +105,7 @@ public class ContentWriter {
public int commit() {
if (mCommitParams != null) {
return mContext.getContentResolver().update(mCommitParams.mUri, getValues(),
return mContext.getContentResolver().update(mCommitParams.mUri, getValues(mContext),
mCommitParams.mWhere, mCommitParams.mSelectionArgs);
}
return 0;