Merge "Fix crash when changing navigation modes" into qt-dev

am: 2abd554786 Change-Id: I1c2974948df42ba3fb46876ea5e7f7315b8779a2
2019-05-28 19:42:51 -07:00
parent 7d1bb399e3 2abd554786
commit 5c3086add5
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java
@@ -66,7 +66,9 @@ public class RotationContextButton extends ContextualButton implements

    @Override
    public void onDestroy() {
-        mRotationButtonController.cleanUp();
+        if (mRotationButtonController != null) {
+            mRotationButtonController.cleanUp();
+        }
    }

    @Override