commit c4401128df94402ccc0800c98189e369957e8fcf
author Antonio Kantek <kanant@google.com> Mon May 11 18:40:11 2020 -0700
committer Antonio Kantek <kanant@google.com> Tue May 12 10:23:20 2020 -0700
tree 57ced8194a3827a86572e0b4e0af0b75ac37870d
parent 0e72990e11ca9a2576ce5ba4961bd863d392e264

Cleaning checkstyle issues

Cleaning checkstyle issues for CarSensorConfig.java and
properly annotating methods in CarDrivingStateEvent.java with @Override

Bug: 149600887
Test: atest CarServiceUnitTest
Change-Id: I8ee5f93e23335723776e2bac9684f9c1293fc1bc

car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java

diff --git a/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java b/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java
index 75183eb..db2cf55 100644
--- a/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java
+++ b/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java
@@ -86,10 +86,13 @@
 
     public static final Parcelable.Creator<CarDrivingStateEvent> CREATOR =
             new Parcelable.Creator<CarDrivingStateEvent>() {
+
+                @Override
                 public CarDrivingStateEvent createFromParcel(Parcel in) {
                     return new CarDrivingStateEvent(in);
                 }
 
+                @Override
                 public CarDrivingStateEvent[] newArray(int size) {
                     return new CarDrivingStateEvent[size];
                 }

car-lib/src/android/car/hardware/CarSensorConfig.java

diff --git a/car-lib/src/android/car/hardware/CarSensorConfig.java b/car-lib/src/android/car/hardware/CarSensorConfig.java
index 77f8dc5..4910def 100644
--- a/car-lib/src/android/car/hardware/CarSensorConfig.java
+++ b/car-lib/src/android/car/hardware/CarSensorConfig.java
@@ -19,7 +19,6 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import java.util.ArrayList;
 
 /**
  * A CarSensorConfig object corresponds to a single sensor type coming from the car.
@@ -28,20 +27,20 @@
 public class CarSensorConfig implements Parcelable {
     /** List of property specific mapped elements in bundle for WHEEL_TICK_DISTANCE sensor*/
     /** @hide */
-    public final static String WHEEL_TICK_DISTANCE_SUPPORTED_WHEELS =
-        "android.car.wheelTickDistanceSupportedWheels";
+    public static final String WHEEL_TICK_DISTANCE_SUPPORTED_WHEELS =
+            "android.car.wheelTickDistanceSupportedWheels";
     /** @hide */
-    public final static String WHEEL_TICK_DISTANCE_FRONT_LEFT_UM_PER_TICK =
-        "android.car.wheelTickDistanceFrontLeftUmPerTick";
+    public static final String WHEEL_TICK_DISTANCE_FRONT_LEFT_UM_PER_TICK =
+            "android.car.wheelTickDistanceFrontLeftUmPerTick";
     /** @hide */
-    public final static String WHEEL_TICK_DISTANCE_FRONT_RIGHT_UM_PER_TICK =
-        "android.car.wheelTickDistanceFrontRightUmPerTick";
+    public static final String WHEEL_TICK_DISTANCE_FRONT_RIGHT_UM_PER_TICK =
+            "android.car.wheelTickDistanceFrontRightUmPerTick";
     /** @hide */
-    public final static String WHEEL_TICK_DISTANCE_REAR_RIGHT_UM_PER_TICK =
-        "android.car.wheelTickDistanceRearRightUmPerTick";
+    public static final String WHEEL_TICK_DISTANCE_REAR_RIGHT_UM_PER_TICK =
+            "android.car.wheelTickDistanceRearRightUmPerTick";
     /** @hide */
-    public final static String WHEEL_TICK_DISTANCE_REAR_LEFT_UM_PER_TICK =
-        "android.car.wheelTickDistanceRearLeftUmPerTick";
+    public static final String WHEEL_TICK_DISTANCE_REAR_LEFT_UM_PER_TICK =
+            "android.car.wheelTickDistanceRearLeftUmPerTick";
 
     /** Config data stored in Bundle */
     private final Bundle mConfig;
@@ -67,16 +66,19 @@
     }
 
     /** @hide */
-    public static final Parcelable.Creator<CarSensorConfig> CREATOR
-    = new Parcelable.Creator<CarSensorConfig>() {
-        public CarSensorConfig createFromParcel(Parcel in) {
-            return new CarSensorConfig(in);
-        }
+    public static final Parcelable.Creator<CarSensorConfig> CREATOR =
+            new Parcelable.Creator<CarSensorConfig>() {
 
-        public CarSensorConfig[] newArray(int size) {
-            return new CarSensorConfig[size];
-        }
-    };
+            @Override
+            public CarSensorConfig createFromParcel(Parcel in) {
+                return new CarSensorConfig(in);
+            }
+
+            @Override
+            public CarSensorConfig[] newArray(int size) {
+                return new CarSensorConfig[size];
+            }
+        };
 
     /** @hide */
     public CarSensorConfig(int type, Bundle b) {
@@ -101,10 +103,9 @@
     public int getInt(String key) {
         if (mConfig.containsKey(key)) {
             return mConfig.getInt(key);
-        } else {
-            throw new IllegalArgumentException("SensorType " + mType +
-                " does not contain key: " + key);
         }
+        throw new IllegalArgumentException("SensorType " + mType
+            + " does not contain key: " + key);
     }
 
     /** @hide */