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

am: 93cc6add78 Change-Id: Ibb0817cc09c630b3231ef6575802d09683466470
2019-05-28 19:48:53 -07:00
parent 0584320eed 93cc6add78
commit 0dc979a600
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