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

am: 2abd554786 Change-Id: Id21c87dfb1816965a2a811a2ce4fd63b41cf5e29
2019-05-28 19:43:26 -07:00
parent 2c57a413f3 2abd554786
commit 93cc6add78
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