commit 8db0af634ac9c6ab77a2f1b41258abf2fb05677c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 07 01:08:19 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 07 01:08:19 2021 +0000
tree d4ec8c1f8a475b27d451b6b9998981a2ce0ba394
parent 91ebef7857c1b1a7f9d2c7456c8c578cd3f6a23a
parent 2f947753342f648f10ed18e1fe6b5964a86b0e0a

Snap for 7526818 from 2f947753342f648f10ed18e1fe6b5964a86b0e0a to sc-d1-release

Change-Id: I2e64f636810f116f8584ad028c8f89eb64b886a9

src/com/android/wallpaper/picker/CustomizationPickerFragment.java

diff --git a/src/com/android/wallpaper/picker/CustomizationPickerFragment.java b/src/com/android/wallpaper/picker/CustomizationPickerFragment.java
index d772ace..8884c0e 100644
--- a/src/com/android/wallpaper/picker/CustomizationPickerFragment.java
+++ b/src/com/android/wallpaper/picker/CustomizationPickerFragment.java
@@ -15,6 +15,7 @@
  */
 package com.android.wallpaper.picker;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -87,8 +88,14 @@
 
         initSections(savedInstanceState);
         mSectionControllers.forEach(controller ->
-                mNestedScrollView.post(() ->
-                        sectionContainer.addView(controller.createView(getContext()))
+                mNestedScrollView.post(() -> {
+                            final Context context = getContext();
+                            if (context == null) {
+                                Log.w(TAG, "Adding section views with null context");
+                                return;
+                            }
+                            sectionContainer.addView(controller.createView(context));
+                        }
                 )
         );
         final Bundle savedInstanceStateRef = savedInstanceState;