commit 34ba412d099f712148975844301934acfe18e5e1
author chihhangchuang <chihhangchuang@google.com> Mon May 04 11:25:48 2020 +0800
committer chihhangchuang <chihhangchuang@google.com> Mon May 04 11:25:48 2020 +0800
tree 00f4c0024a54f8c92f80b8439e884e54689843b1
parent 3599742201a1062d670e85df52d029caaa5b5d4a

Add null check for selected button

Test: Manually
Bug: 155157385
Change-Id: Ia6e390639ea0a1c445c271ffa0a999d60eb84d28

src/com/android/wallpaper/widget/BottomActionBar.java

diff --git a/src/com/android/wallpaper/widget/BottomActionBar.java b/src/com/android/wallpaper/widget/BottomActionBar.java
index 8893c32..0f6cd02 100644
--- a/src/com/android/wallpaper/widget/BottomActionBar.java
+++ b/src/com/android/wallpaper/widget/BottomActionBar.java
@@ -102,6 +102,10 @@
         mBottomSheetBehavior.setBottomSheetCallback(new BottomSheetCallback() {
             @Override
             public void onStateChanged(@NonNull View bottomSheet, int newState) {
+                if (mSelectedAction == null) {
+                    return;
+                }
+
                 if (newState == STATE_COLLAPSED) {
                     updateSelectedState(mSelectedAction, /* selected= */ false);
                     mSelectedAction = null;
@@ -142,13 +146,13 @@
 
         setActionClickListener(action, unused -> {
             mContentViewMap.forEach((a, v) -> v.setVisibility(a.equals(action) ? VISIBLE : GONE));
-            BottomAction previousHighlightButton = mSelectedAction;
+            BottomAction previousSelectedButton = mSelectedAction;
             mSelectedAction = action;
             // If the bottom sheet is expanding with a highlight button, then clicking another
             // action button to show bottom sheet will only update the content for expanding bottom
             // sheet, and update the highlight button.
-            if (previousHighlightButton != null && !action.equals(previousHighlightButton)) {
-                updateSelectedState(previousHighlightButton, /* selected= */ false);
+            if (previousSelectedButton != null && !action.equals(previousSelectedButton)) {
+                updateSelectedState(previousSelectedButton, /* selected= */ false);
                 updateSelectedState(mSelectedAction, /* selected= */ true);
                 return;
             }