Merge "Make drivingstate parcelable classes final."
diff --git a/car-lib/api/current.txt b/car-lib/api/current.txt
index c59a5e3..19823a8 100644
--- a/car-lib/api/current.txt
+++ b/car-lib/api/current.txt
@@ -262,7 +262,7 @@
package android.car.drivingstate {
- public class CarUxRestrictions implements android.os.Parcelable {
+ public final class CarUxRestrictions implements android.os.Parcelable {
ctor public CarUxRestrictions(android.car.drivingstate.CarUxRestrictions);
method public int describeContents();
method @android.car.drivingstate.CarUxRestrictions.CarUxRestrictionsInfo public int getActiveRestrictions();
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index 4462f6c..905e0f5 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -197,7 +197,7 @@
package android.car.content.pm {
- public class AppBlockingPackageInfo implements android.os.Parcelable {
+ public final class AppBlockingPackageInfo implements android.os.Parcelable {
ctor public AppBlockingPackageInfo(String, int, int, int, @Nullable android.content.pm.Signature[], @Nullable String[]);
ctor public AppBlockingPackageInfo(android.os.Parcel);
method public int describeContents();
@@ -213,7 +213,7 @@
field public final android.content.pm.Signature[] signatures;
}
- public class CarAppBlockingPolicy implements android.os.Parcelable {
+ public final class CarAppBlockingPolicy implements android.os.Parcelable {
ctor public CarAppBlockingPolicy(android.car.content.pm.AppBlockingPackageInfo[], android.car.content.pm.AppBlockingPackageInfo[]);
ctor public CarAppBlockingPolicy(android.os.Parcel);
method public int describeContents();
@@ -502,7 +502,7 @@
package android.car.drivingstate {
- public class CarDrivingStateEvent implements android.os.Parcelable {
+ public final class CarDrivingStateEvent implements android.os.Parcelable {
ctor public CarDrivingStateEvent(int, long);
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
diff --git a/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java b/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java
index 8e91537..3c1a356 100644
--- a/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java
+++ b/car-lib/src/android/car/content/pm/AppBlockingPackageInfo.java
@@ -31,7 +31,7 @@
* @hide
*/
@SystemApi
-public class AppBlockingPackageInfo implements Parcelable {
+public final class AppBlockingPackageInfo implements Parcelable {
/** Package name for the package to block or allow. */
public final String packageName;
diff --git a/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java b/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java
index 803451a..3ada352 100644
--- a/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java
+++ b/car-lib/src/android/car/content/pm/CarAppBlockingPolicy.java
@@ -19,9 +19,7 @@
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
-import android.util.Log;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -30,7 +28,7 @@
* @hide
*/
@SystemApi
-public class CarAppBlockingPolicy implements Parcelable {
+public final class CarAppBlockingPolicy implements Parcelable {
private static final String TAG = CarAppBlockingPolicy.class.getSimpleName();
public final AppBlockingPackageInfo[] whitelists;
diff --git a/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java b/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java
index e3fa2ea..77dc08d 100644
--- a/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java
+++ b/car-lib/src/android/car/drivingstate/CarDrivingStateEvent.java
@@ -31,7 +31,7 @@
* @hide
*/
@SystemApi
-public class CarDrivingStateEvent implements Parcelable {
+public final class CarDrivingStateEvent implements Parcelable {
// New Driving States
/**
diff --git a/car-lib/src/android/car/drivingstate/CarUxRestrictions.java b/car-lib/src/android/car/drivingstate/CarUxRestrictions.java
index acccfdd..149f1dc 100644
--- a/car-lib/src/android/car/drivingstate/CarUxRestrictions.java
+++ b/car-lib/src/android/car/drivingstate/CarUxRestrictions.java
@@ -61,7 +61,7 @@
* and not to the absolute driving state.
* </ul>
*/
-public class CarUxRestrictions implements Parcelable {
+public final class CarUxRestrictions implements Parcelable {
// Default fallback values for the restriction related parameters if the information is
// not available from the underlying service.