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

Commit ebe7fa15 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7438839 from 12e2584b to sc-v2-release 

Change-Id: I4cd9a78c7a127074ccbd8092f3b05dce77448ef8
parents e127fa32 12e2584b

src/com/android/customization/model/grid/LauncherGridOptionsProvider.java

+0 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import com.android.customization.model.ResourceConstants; 
import com.android.wallpaper.R;

import com.android.wallpaper.util.PreviewUtils;



import com.bumptech.glide.Glide;



import java.util.ArrayList;

import java.util.List;
@@ -99,7 +97,6 @@ public class LauncherGridOptionsProvider { 
                mOptions.add(new GridOption(title, name, isSet, rows, cols,

                        mPreviewUtils.getUri(PREVIEW), previewCount, iconPath));

            }

            Glide.get(mContext).clearDiskCache();

        } catch (Exception e) {

            mOptions = null;

        }

src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class ThemedIconSwitchProvider { 
    }



    @WorkerThread

    protected boolean fetchThemedIconEnabled() {

    public boolean fetchThemedIconEnabled() {

        ContentResolver contentResolver = mContext.getContentResolver();

        try (Cursor cursor = contentResolver.query(

                mThemedIconUtils.getUriForPath(ICON_THEMED), /* projection= */