Merge "Implemented CarUserManager.setUserIdentificationAssociation()" into rvc-dev
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];
}
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 */
diff --git a/tests/SecondaryHomeApp/Android.bp b/tests/SecondaryHomeApp/Android.bp
index ce8e763..04da06b 100644
--- a/tests/SecondaryHomeApp/Android.bp
+++ b/tests/SecondaryHomeApp/Android.bp
@@ -22,14 +22,10 @@
],
static_libs: [
- "android.car.userlib",
"androidx.appcompat_appcompat",
- "androidx.recyclerview_recyclerview",
- "androidx.legacy_legacy-support-v4",
"androidx.lifecycle_lifecycle-extensions",
"com.google.android.material_material",
"CarNotificationLib",
- "car-ui-lib"
],
libs: [
diff --git a/tests/SecondaryHomeApp/AndroidManifest.xml b/tests/SecondaryHomeApp/AndroidManifest.xml
index 0a84531..5d22b70 100644
--- a/tests/SecondaryHomeApp/AndroidManifest.xml
+++ b/tests/SecondaryHomeApp/AndroidManifest.xml
@@ -45,6 +45,7 @@
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.SECONDARY_HOME"/>
</intent-filter>
</activity>
<service android:name=".launcher.NotificationListener"