From 399ddb02041d66b42cabba8ebbf2a9690195cf5b Mon Sep 17 00:00:00 2001
From: Annie Chin <afchin@google.com>
Date: Wed, 3 Aug 2016 14:19:59 -0700
Subject: [PATCH] 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
---
 .../android/systemui/statusbar/phone/NavigationBarView.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 0f4d9ed278c78..1a6dd12431d3d 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 @@ public class NavigationBarView extends LinearLayout {
             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;
     }