Merge "Fixing checkstyle issues for android/car/hardware." into rvc-dev
diff --git a/car-lib/src/android/car/hardware/CarPropertyConfig.java b/car-lib/src/android/car/hardware/CarPropertyConfig.java
index a74a361..df7ac5f 100644
--- a/car-lib/src/android/car/hardware/CarPropertyConfig.java
+++ b/car-lib/src/android/car/hardware/CarPropertyConfig.java
@@ -434,8 +434,8 @@
mMaxValue = maxValue;
}
- public static final Parcelable.Creator<AreaConfig<Object>> CREATOR
- = getCreator(Object.class);
+ public static final Parcelable.Creator<AreaConfig<Object>> CREATOR =
+ getCreator(Object.class);
private static <E> Parcelable.Creator<AreaConfig<E>> getCreator(final Class<E> clazz) {
return new Creator<AreaConfig<E>>() {
@@ -457,8 +457,13 @@
mMaxValue = (T) in.readValue(getClass().getClassLoader());
}
- @Nullable public T getMinValue() { return mMinValue; }
- @Nullable public T getMaxValue() { return mMaxValue; }
+ @Nullable public T getMinValue() {
+ return mMinValue;
+ }
+
+ @Nullable public T getMaxValue() {
+ return mMaxValue;
+ }
@Override
public int describeContents() {
@@ -473,10 +478,10 @@
@Override
public String toString() {
- return "CarAreaConfig{" +
- "mMinValue=" + mMinValue +
- ", mMaxValue=" + mMaxValue +
- '}';
+ return "CarAreaConfig{"
+ + "mMinValue=" + mMinValue
+ + ", mMaxValue=" + mMaxValue
+ + '}';
}
}
@@ -629,6 +634,9 @@
return this;
}
+ /**
+ * Builds a new {@link CarPropertyConfig}.
+ */
public CarPropertyConfig<T> build() {
return new CarPropertyConfig<>(mAccess, mAreaType, mChangeMode, mConfigArray,
mConfigString, mMaxSampleRate, mMinSampleRate,
diff --git a/car-lib/src/android/car/hardware/CarPropertyValue.java b/car-lib/src/android/car/hardware/CarPropertyValue.java
index 38af395..b946af9 100644
--- a/car-lib/src/android/car/hardware/CarPropertyValue.java
+++ b/car-lib/src/android/car/hardware/CarPropertyValue.java
@@ -26,6 +26,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
/**
* Stores values broken down by area for a vehicle property.
@@ -35,7 +36,7 @@
*
*/
public final class CarPropertyValue<T> implements Parcelable {
- private final static Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+ private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
private final int mPropertyId;
private final int mAreaId;
@@ -152,7 +153,7 @@
// Special handling for String and byte[] to mitigate transaction buffer limitations.
if (String.class.equals(valueClass)) {
- dest.writeBlob(((String)mValue).getBytes(DEFAULT_CHARSET));
+ dest.writeBlob(((String) mValue).getBytes(DEFAULT_CHARSET));
} else if (byte[].class.equals(valueClass)) {
dest.writeBlob((byte[]) mValue);
} else {
@@ -199,12 +200,12 @@
/** @hide */
@Override
public String toString() {
- return "CarPropertyValue{" +
- "mPropertyId=0x" + toHexString(mPropertyId) +
- ", mAreaId=0x" + toHexString(mAreaId) +
- ", mStatus=" + mStatus +
- ", mTimestamp=" + mTimestamp +
- ", mValue=" + mValue +
- '}';
+ return "CarPropertyValue{"
+ + "mPropertyId=0x" + toHexString(mPropertyId)
+ + ", mAreaId=0x" + toHexString(mAreaId)
+ + ", mStatus=" + mStatus
+ + ", mTimestamp=" + mTimestamp
+ + ", mValue=" + mValue
+ + '}';
}
}
diff --git a/car-lib/src/android/car/hardware/CarSensorEvent.java b/car-lib/src/android/car/hardware/CarSensorEvent.java
index b92a789..3f33a8d 100644
--- a/car-lib/src/android/car/hardware/CarSensorEvent.java
+++ b/car-lib/src/android/car/hardware/CarSensorEvent.java
@@ -164,8 +164,8 @@
dest.writeLongArray(longValues);
}
- public static final Parcelable.Creator<CarSensorEvent> CREATOR
- = new Parcelable.Creator<CarSensorEvent>() {
+ public static final Parcelable.Creator<CarSensorEvent> CREATOR =
+ new Parcelable.Creator<CarSensorEvent>() {
public CarSensorEvent createFromParcel(Parcel in) {
return new CarSensorEvent(in);
}
@@ -203,6 +203,9 @@
"Invalid sensor type: expected %d, got %d", type, sensorType));
}
+ /**
+ * Environment data with timestamp and temperature.
+ */
public static class EnvironmentData {
public long timestamp;
/** If unsupported by the car, this value is NaN. */
@@ -577,8 +580,7 @@
* CarSensorEvent.
* @hide
*/
- public CarFuelDoorOpenData getCarFuelDoorOpenData(
- CarFuelDoorOpenData data) {
+ public CarFuelDoorOpenData getCarFuelDoorOpenData(CarFuelDoorOpenData data) {
checkType(CarSensorManager.SENSOR_TYPE_FUEL_DOOR_OPEN);
if (data == null) {
data = new CarFuelDoorOpenData();
@@ -608,8 +610,7 @@
* CarSensorEvent.
* @hide
*/
- public CarEvBatteryLevelData getCarEvBatteryLevelData(
- CarEvBatteryLevelData data) {
+ public CarEvBatteryLevelData getCarEvBatteryLevelData(CarEvBatteryLevelData data) {
checkType(CarSensorManager.SENSOR_TYPE_EV_BATTERY_LEVEL);
if (data == null) {
data = new CarEvBatteryLevelData();
@@ -646,8 +647,7 @@
* CarSensorEvent.
* @hide
*/
- public CarEvChargePortOpenData getCarEvChargePortOpenData(
- CarEvChargePortOpenData data) {
+ public CarEvChargePortOpenData getCarEvChargePortOpenData(CarEvChargePortOpenData data) {
checkType(CarSensorManager.SENSOR_TYPE_EV_CHARGE_PORT_OPEN);
if (data == null) {
data = new CarEvChargePortOpenData();
@@ -668,7 +668,7 @@
/**
* Convenience method for obtaining a {@link CarEvChargePortConnectedData} object from a
- * CarSensorEvent object with type {@link CarSensorManager#SENSOR_TYPE_EV_CHARGE_PORT_CONNECTED}.
+ * CarSensorEvent with type {@link CarSensorManager#SENSOR_TYPE_EV_CHARGE_PORT_CONNECTED}.
*
* @param data an optional output parameter which, if non-null, will be used by this method
* instead of a newly created object.
@@ -677,7 +677,7 @@
* @hide
*/
public CarEvChargePortConnectedData getCarEvChargePortConnectedData(
- CarEvChargePortConnectedData data) {
+ CarEvChargePortConnectedData data) {
checkType(CarSensorManager.SENSOR_TYPE_EV_CHARGE_PORT_CONNECTED);
if (data == null) {
data = new CarEvChargePortConnectedData();
@@ -709,7 +709,7 @@
* @hide
*/
public CarEvBatteryChargeRateData getCarEvBatteryChargeRateData(
- CarEvBatteryChargeRateData data) {
+ CarEvBatteryChargeRateData data) {
checkType(CarSensorManager.SENSOR_TYPE_EV_BATTERY_CHARGE_RATE);
if (data == null) {
data = new CarEvBatteryChargeRateData();
diff --git a/car-lib/src/android/car/hardware/CarSensorManager.java b/car-lib/src/android/car/hardware/CarSensorManager.java
index 082c8eb..d047aa1 100644
--- a/car-lib/src/android/car/hardware/CarSensorManager.java
+++ b/car-lib/src/android/car/hardware/CarSensorManager.java
@@ -496,7 +496,7 @@
* A CarSensorConfig object is returned for every sensor type. However, if there is no
* config, the data will be empty.
*
- * @param sensor type to request
+ * @param type sensor type to request
* @return CarSensorConfig object
* @hide
*/
diff --git a/car-lib/src/android/car/hardware/CarVendorExtensionManager.java b/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
index b796156..639eab1 100644
--- a/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
+++ b/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
@@ -45,8 +45,8 @@
@SystemApi
public final class CarVendorExtensionManager extends CarManagerBase {
- private final static boolean DBG = false;
- private final static String TAG = CarVendorExtensionManager.class.getSimpleName();
+ private static final boolean DBG = false;
+ private static final String TAG = CarVendorExtensionManager.class.getSimpleName();
private final CarPropertyManager mPropertyManager;
@GuardedBy("mLock")
diff --git a/car-lib/src/android/car/hardware/cabin/CarCabinManager.java b/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
index 7318176..7114ad8 100644
--- a/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
+++ b/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
@@ -57,8 +57,8 @@
@Deprecated
@SystemApi
public final class CarCabinManager extends CarManagerBase {
- private final static boolean DBG = false;
- private final static String TAG = "CarCabinManager";
+ private static final boolean DBG = false;
+ private static final String TAG = CarCabinManager.class.getSimpleName();
private final CarPropertyManager mCarPropertyMgr;
private final ArraySet<CarCabinEventCallback> mCallbacks = new ArraySet<>();
private CarPropertyEventListenerToBase mListenerToBase = null;
@@ -416,7 +416,7 @@
private static class CarPropertyEventListenerToBase implements CarPropertyEventCallback {
private final WeakReference<CarCabinManager> mManager;
- public CarPropertyEventListenerToBase(CarCabinManager manager) {
+ CarPropertyEventListenerToBase(CarCabinManager manager) {
mManager = new WeakReference<>(manager);
}
diff --git a/car-lib/src/android/car/hardware/power/CarPowerManager.java b/car-lib/src/android/car/hardware/power/CarPowerManager.java
index d9ff33d..54d7b28 100644
--- a/car-lib/src/android/car/hardware/power/CarPowerManager.java
+++ b/car-lib/src/android/car/hardware/power/CarPowerManager.java
@@ -35,8 +35,8 @@
*/
@SystemApi
public class CarPowerManager extends CarManagerBase {
- private final static boolean DBG = false;
- private final static String TAG = "CarPowerManager";
+ private static final boolean DBG = false;
+ private static final String TAG = CarPowerManager.class.getSimpleName();
private final Object mLock = new Object();
private final ICarPower mService;
@@ -215,7 +215,7 @@
* @hide
*/
public void setListenerWithCompletion(CarPowerStateListenerWithCompletion listener) {
- synchronized(mLock) {
+ synchronized (mLock) {
if (mListener != null || mListenerWithCompletion != null) {
throw new IllegalStateException("Listener must be cleared first");
}