commit 2849029eceacaab9167155892181d556ad046400
author Chuck Liao <chuckliao@google.com> Wed Jun 30 12:18:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 30 12:18:46 2021 +0000
tree b91151ada8fe43864c92adcd79838d9f516b21df
parent 3eecb6dcecf753342233e805e62cbb789992c360
parent 77aa9969ad56229083a542d6fc60e2069e726081

Merge "Fix exception happened in maybeSetUpImageGrid()" into sc-dev am: 77aa9969ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/15143001

Change-Id: Ib69063fb66355e530c92806b078bcae10b0ba754

src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java

diff --git a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
index 97c2eaa..a7d1f5c 100755
--- a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
+++ b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
@@ -582,6 +582,9 @@
         if (mCategory == null) {
             return;
         }
+        if (getContext() == null) {
+            return;
+        }
 
         // Wallpaper count could change, so we may need to change the layout(2 or 3 columns layout)
         GridLayoutManager gridLayoutManager = (GridLayoutManager) mImageGrid.getLayoutManager();