| commit | 8651892a0d914055de6f4a4b5ecc01266c4103c3 | [log] [tgz] |
|---|---|---|
| author | James O'Leary <jamesoleary@google.com> | Tue Jun 22 05:25:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 22 05:25:37 2021 +0000 |
| tree | 0aebc8ea0acf1ce9e53b89495d09b4d39533abe0 | |
| parent | 3f78cf903caf15428f876c09a4d79fc0916938f1 [diff] | |
| parent | 0c26b0e9795840c248a00d5fd2a816de7491b506 [diff] |
Fix crash when workspace preview arrives later than expected. am: 0c26b0e979 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/15048682 Change-Id: I1172a78e8a306d61388959308359d7fc99f4754e
diff --git a/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java b/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java index c469820..2661923 100644 --- a/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java +++ b/src/com/android/wallpaper/picker/WorkspaceSurfaceHolderCallback.java
@@ -164,6 +164,12 @@ protected void requestPreview(SurfaceView workspaceSurface, PreviewUtils.WorkspacePreviewCallback callback) { + if (workspaceSurface.getDisplay() == null) { + Log.w(TAG, + "No display ID, avoiding asking for workspace preview, lest WallpaperPicker " + + "crash"); + return; + } Bundle request = SurfaceViewUtils.createSurfaceViewRequest(workspaceSurface); if (mWallpaperColors != null) { request.putParcelable(KEY_WALLPAPER_COLORS, mWallpaperColors);