Merge "Merge "Fix crash when changing navigation modes" into qt-dev am: 2abd554786 am: 5c3086add5" into qt-r1-dev-plus-aosp

am: 820a64159b Change-Id: I94a7f61a964df0947260aa4963153cb0aebe5ba5
2019-05-28 19:54:30 -07:00
parent 776a1178d6 820a64159b
commit 9d8797a12e
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