Wallpaper clean up as a result of getting rid of USE_SURFACE_VIEW_FOR_PREVIEW flag

Bug: 159755324
Test: manual
Change-Id: I47e283b90fb8711cc18fb746af42e9c9c62af444

1 files changed, 5 insertions, 7 deletions

diff --git a/src/com/android/customization/model/grid/GridOptionsManager.java b/src/com/android/customization/model/grid/GridOptionsManager.java
index a0ae04cc..cf551478 100644
--- a/src/com/android/customization/model/grid/GridOptionsManager.java
+++ b/src/com/android/customization/model/grid/GridOptionsManager.java
@@ -17,7 +17,6 @@ package com.android.customization.model.grid;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.util.Pair;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -66,7 +65,7 @@ public class GridOptionsManager implements CustomizationManager<GridOption> {
         return mProvider.renderPreview(gridName, bundle);
     }
 
-    private static class FetchTask extends AsyncTask<Void, Void, Pair<List<GridOption>, String>> {
+    private static class FetchTask extends AsyncTask<Void, Void, List<GridOption>> {
         private final LauncherGridOptionsProvider mProvider;
         @Nullable private final OptionsFetchedListener<GridOption> mCallback;
         private final boolean mReload;
@@ -79,16 +78,15 @@ public class GridOptionsManager implements CustomizationManager<GridOption> {
         }
 
         @Override
-        protected Pair<List<GridOption>, String> doInBackground(Void[] params) {
+        protected List<GridOption> doInBackground(Void[] params) {
             return mProvider.fetch(mReload);
         }
 
         @Override
-        protected void onPostExecute(Pair<List<GridOption>, String> gridOptionsResult) {
+        protected void onPostExecute(List<GridOption> gridOptions) {
             if (mCallback != null) {
-                if (gridOptionsResult != null && gridOptionsResult.first != null
-                        && !gridOptionsResult.first.isEmpty()) {
-                    mCallback.onOptionsLoaded(gridOptionsResult.first);
+                if (gridOptions != null && !gridOptions.isEmpty()) {
+                    mCallback.onOptionsLoaded(gridOptions);
                 } else {
                     mCallback.onError(null);
                 }