commit 399ddb02041d66b42cabba8ebbf2a9690195cf5b
author Annie Chin <afchin@google.com> Wed Aug 03 14:19:59 2016 -0700
committer Annie Chin <afchin@google.com> Wed Aug 03 14:19:59 2016 -0700
tree 75333ae5b39f459cd322ecf28a6ec3bf5cc567e3
parent 4a051a849d3be60f84fdd603bfb42af4d07cdea0

setCarMode() only when car mode changes

Bug: 30604178

Fixes a bug where opa would be enabled for non-opa-enabled devices upon
orientation change.

Change-Id: I5f8f913a53f180d783ba1c6d1fab22514986847e

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 0f4d9ed..1a6dd12 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -620,11 +620,12 @@
             if (mCarMode && uiMode != Configuration.UI_MODE_TYPE_CAR) {
                 mCarMode = false;
                 uiCarModeChanged = true;
+                getHomeButton().setCarMode(mCarMode);
             } else if (uiMode == Configuration.UI_MODE_TYPE_CAR) {
                 mCarMode = true;
                 uiCarModeChanged = true;
+                getHomeButton().setCarMode(mCarMode);
             }
-            getHomeButton().setCarMode(mCarMode);
         }
         return uiCarModeChanged;
     }