commit 968e390acc12ab3e1e8d7af5069db50932dbaed2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 17 00:43:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 17 00:43:12 2020 +0000
tree ea127f49eb51d270835b34218eb938ae560cdb75
parent bfbf03da21db3cf656493d84e7d5cf8d161a20b0
parent b37b7a11fb702fd1bd4213c34550cea0eedf10dd

DO NOT MERGE: Remove VehicleGear reference am: b37b7a11fb

Change-Id: Ibc845b78030b549f40adbb8531200559bd87618e

library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java

diff --git a/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java b/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
index 891e01a..d7587c1 100644
--- a/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
+++ b/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
@@ -19,7 +19,6 @@
 import android.car.Car;
 import android.car.CarNotConnectedException;
 import android.car.VehicleAreaType;
-import android.car.VehicleGear;
 import android.car.VehiclePropertyIds;
 import android.car.drivingstate.CarUxRestrictions;
 import android.car.drivingstate.CarUxRestrictionsManager;
@@ -52,6 +51,7 @@
 
     private static final String SETUP_PACKAGE = "com.google.android.car.setupwizard";
     private static final String SETUP_CLASS = SETUP_PACKAGE + ".ExitActivity";
+    private static final int GEAR_REVERSE = 2;
 
     private Car mCar;
     private CarUxRestrictionsManager mRestrictionsManager;
@@ -76,7 +76,7 @@
         public void onChangeEvent(CarPropertyValue value) {
             switch (value.getPropertyId()) {
                 case VehiclePropertyIds.GEAR_SELECTION:
-                    if ((Integer) value.getValue() == VehicleGear.GEAR_REVERSE) {
+                    if ((Integer) value.getValue() == GEAR_REVERSE) {
                         Log.v(TAG, "Gear has reversed, exiting SetupWizard.");
                         sendExitActivityIntent();
                     }
@@ -320,7 +320,7 @@
                     VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL);
         if (gearSelection != null
                 && gearSelection.getStatus() == CarPropertyValue.STATUS_AVAILABLE) {
-            if (gearSelection.getValue() == VehicleGear.GEAR_REVERSE) {
+            if (gearSelection.getValue() == GEAR_REVERSE) {
                 Log.v(TAG, "SetupWizard started when gear is in reverse, exiting.");
                 sendExitActivityIntent();
             }