Merge "Fix crash when changing navigation modes" into qt-dev am: 2abd554786

am: 5c3086add5 Change-Id: I3589bc26fa0e513e80aecbc950094e6522b75867
2019-05-28 19:47:49 -07:00
parent c97a380168 5c3086add5
commit 9fee8f6c31
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