commit 0928456d55324bee19fe53ef7a01e7f46b0996db
author Samuel Fufa <sfufa@google.com> Thu Mar 26 14:09:58 2020 -0700
committer Samuel Fufa <sfufa@google.com> Thu Mar 26 17:03:44 2020 -0700
tree ca5d0ca339356ee00b6c33c4cda40b44c6a0ee4e
parent c7189a6f2d55c977998dc920edb303d2a09a5a1d

Fix NPE on FeatureFlag.addChangeListener

Bug: 152400212
Change-Id: I64890370f1d638048b0340bcb537ffdbf7011681

quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
index 5836ebd..010694b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/DeviceFlag.java
@@ -54,6 +54,9 @@
 
     @Override
     public void addChangeListener(Context context, Runnable r) {
+        if (mListeners == null) {
+            initialize(context);
+        }
         mListeners.add(r);
     }