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

Merge "Fix NPE in LauncherPreviewRenderer." into udc-dev am: 7158f9c427 am: 543fcec265 am: f85d6550ef

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122640

Change-Id: I9f3ec68ff4203b23262e9039969cafe0286e18f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Stefan Andonian
2023-05-16 20:13:51 +00:00
committed by Automerger Merge Worker
parent ed4e654234 f85d6550ef
commit 3e307c8cfb
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+6 -2
View File
@@ -51,7 +51,9 @@ import com.android.launcher3.Utilities;
import com.android.launcher3.Workspace; import com.android.launcher3.Workspace;
import com.android.launcher3.graphics.LauncherPreviewRenderer.PreviewContext; import com.android.launcher3.graphics.LauncherPreviewRenderer.PreviewContext;
import com.android.launcher3.model.BgDataModel; import com.android.launcher3.model.BgDataModel;
import com.android.launcher3.model.BgDataModel.Callbacks;
import com.android.launcher3.model.GridSizeMigrationUtil; import com.android.launcher3.model.GridSizeMigrationUtil;
import com.android.launcher3.model.LauncherBinder;
import com.android.launcher3.model.LoaderTask; import com.android.launcher3.model.LoaderTask;
import com.android.launcher3.model.ModelDbController; import com.android.launcher3.model.ModelDbController;
import com.android.launcher3.provider.LauncherDbUtils; import com.android.launcher3.provider.LauncherDbUtils;
@@ -226,12 +228,14 @@ public class PreviewSurfaceRenderer {
LauncherAppState.getInstance(previewContext) LauncherAppState.getInstance(previewContext)
.getModel().getModelDbController().clearEmptyDbFlag(); .getModel().getModelDbController().clearEmptyDbFlag();
BgDataModel bgModel = new BgDataModel();
new LoaderTask( new LoaderTask(
LauncherAppState.getInstance(previewContext), LauncherAppState.getInstance(previewContext),
/* bgAllAppsList= */ null, /* bgAllAppsList= */ null,
new BgDataModel(), bgModel,
LauncherAppState.getInstance(previewContext).getModel().getModelDelegate(), LauncherAppState.getInstance(previewContext).getModel().getModelDelegate(),
/* results= */ null) { new LauncherBinder(LauncherAppState.getInstance(previewContext), bgModel,
/* bgAllAppsList= */ null, new Callbacks[0])) {
@Override @Override
public void run() { public void run() {
src/com/android/launcher3/model/LoaderTask.java
+6 -3
View File
@@ -51,6 +51,7 @@ import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.LongSparseArray; import android.util.LongSparseArray;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.android.launcher3.DeviceProfile; import com.android.launcher3.DeviceProfile;
@@ -118,6 +119,7 @@ public class LoaderTask implements Runnable {
private static final boolean DEBUG = true; private static final boolean DEBUG = true;
@NonNull
protected final LauncherAppState mApp; protected final LauncherAppState mApp;
private final AllAppsList mBgAllAppsList; private final AllAppsList mBgAllAppsList;
protected final BgDataModel mBgDataModel; protected final BgDataModel mBgDataModel;
@@ -125,6 +127,7 @@ public class LoaderTask implements Runnable {
private FirstScreenBroadcast mFirstScreenBroadcast; private FirstScreenBroadcast mFirstScreenBroadcast;
@NonNull
private final LauncherBinder mLauncherBinder; private final LauncherBinder mLauncherBinder;
private final LauncherApps mLauncherApps; private final LauncherApps mLauncherApps;
@@ -145,11 +148,11 @@ public class LoaderTask implements Runnable {
private boolean mItemsDeleted = false; private boolean mItemsDeleted = false;
private String mDbName; private String mDbName;
public LoaderTask(LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel dataModel, public LoaderTask(@NonNull LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel bgModel,
ModelDelegate modelDelegate, LauncherBinder launcherBinder) { ModelDelegate modelDelegate, @NonNull LauncherBinder launcherBinder) {
mApp = app; mApp = app;
mBgAllAppsList = bgAllAppsList; mBgAllAppsList = bgAllAppsList;
mBgDataModel = dataModel; mBgDataModel = bgModel;
mModelDelegate = modelDelegate; mModelDelegate = modelDelegate;
mLauncherBinder = launcherBinder; mLauncherBinder = launcherBinder;