From f4c989962cd8accf027b1f10d4cbd51249886b33 Mon Sep 17 00:00:00 2001 From: Mike Digman Date: Wed, 25 Apr 2018 11:25:59 -0700 Subject: [PATCH] Only ripple rotate btn if attached to window Change-Id: I164ba4ed9166941fe5b8fb96539d4b8e70beb6f7 Fixes: 78532076 Fixes: 78568790 Test: boot test without crash --- .../systemui/statusbar/phone/NavigationBarFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java index 66176b36f048c..5597ffdd40823 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -521,7 +521,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks { // Clear any pending suggestion flag as it has either been nullified or is being shown mPendingRotationSuggestion = false; - getView().removeCallbacks(mCancelPendingRotationProposal); + if (getView() != null) getView().removeCallbacks(mCancelPendingRotationProposal); // Handle the visibility change and animation if (visible) { // Appear and change (cannot force) @@ -1141,6 +1141,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks { private final Runnable mRipple = new Runnable() { @Override public void run() { // Cause the ripple to fire via false presses + if (!mRoot.isAttachedToWindow()) return; mRoot.setPressed(true); mRoot.setPressed(false); }