commit 2abd55478604fc39117b6d3ca6f64c6abd847bc1
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 29 02:34:07 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 02:34:07 2019 +0000
tree 0ffc3a62821259dc7f07b3dc0c6b65d2bd235f99
parent 85427e400b51cc501fb63a2e5da78e88d2788932
parent 559f5557fac41a53359efde1c1724a6423b69674

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java
index f1460a6..b117dec 100644
--- 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 @@
 
     @Override
     public void onDestroy() {
-        mRotationButtonController.cleanUp();
+        if (mRotationButtonController != null) {
+            mRotationButtonController.cleanUp();
+        }
     }
 
     @Override