Merge cherrypicks of ['googleplex-android-review.googlesource.com/25952472', 'googleplex-android-review.googlesource.com/25952973'] into 24Q1-release.android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I97ce97906e8ea99dfc39c394add8d77e0eee69a1

9 files changed, 53 insertions, 24 deletions

diff --git a/car-lib-module/api/current.txt b/car-lib-module/api/current.txt
index 413ec1b1fd..84e6875761 100644
--- a/car-lib-module/api/current.txt
+++ b/car-lib-module/api/current.txt
@@ -19,8 +19,8 @@ package android.car {
     method @Deprecated public int getCarConnectionType();
     method @Nullable public Object getCarManager(String);
     method @Nullable public <T> T getCarManager(@NonNull Class<T>);
-    method @Deprecated @NonNull public static android.car.CarVersion getCarVersion();
-    method @Deprecated @NonNull public static android.car.PlatformVersion getPlatformVersion();
+    method @NonNull public static android.car.CarVersion getCarVersion();
+    method @NonNull public static android.car.PlatformVersion getPlatformVersion();
     method @Deprecated public static boolean isApiAndPlatformVersionAtLeast(int, int);
     method @Deprecated public static boolean isApiAndPlatformVersionAtLeast(int, int, int);
     method @Deprecated public static boolean isApiVersionAtLeast(int);
@@ -506,11 +506,11 @@ package android.car {
 package android.car.content.pm {
 
   public final class CarPackageManager {
-    method @Deprecated @NonNull public android.car.CarVersion getTargetCarVersion();
+    method @NonNull public android.car.CarVersion getTargetCarVersion();
     method public boolean isActivityDistractionOptimized(String, String);
     method public boolean isPendingIntentDistractionOptimized(@NonNull android.app.PendingIntent);
     method public boolean isServiceDistractionOptimized(String, String);
-    field @Deprecated public static final String MANIFEST_METADATA_TARGET_CAR_VERSION = "android.car.targetCarVersion";
+    field public static final String MANIFEST_METADATA_TARGET_CAR_VERSION = "android.car.targetCarVersion";
   }
 
 }
diff --git a/car-lib-module/api/system-current.txt b/car-lib-module/api/system-current.txt
index 3543dfa897..05e6bbe484 100644
--- a/car-lib-module/api/system-current.txt
+++ b/car-lib-module/api/system-current.txt
@@ -606,7 +606,7 @@ package android.car.content.pm {
   }
 
   public final class CarPackageManager {
-    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method public boolean isActivityBackedBySafeActivity(android.content.ComponentName);
     method @FlaggedApi("android.car.feature.display_compatibility") @RequiresPermission(allOf={android.car.Car.PERMISSION_QUERY_DISPLAY_COMPATIBILITY, android.Manifest.permission.QUERY_ALL_PACKAGES}) public boolean requiresDisplayCompat(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Deprecated public void setAppBlockingPolicy(String, android.car.content.pm.CarAppBlockingPolicy, int);
diff --git a/car-lib/api/current.txt b/car-lib/api/current.txt
index 413ec1b1fd..84e6875761 100644
--- a/car-lib/api/current.txt
+++ b/car-lib/api/current.txt
@@ -19,8 +19,8 @@ package android.car {
     method @Deprecated public int getCarConnectionType();
     method @Nullable public Object getCarManager(String);
     method @Nullable public <T> T getCarManager(@NonNull Class<T>);
-    method @Deprecated @NonNull public static android.car.CarVersion getCarVersion();
-    method @Deprecated @NonNull public static android.car.PlatformVersion getPlatformVersion();
+    method @NonNull public static android.car.CarVersion getCarVersion();
+    method @NonNull public static android.car.PlatformVersion getPlatformVersion();
     method @Deprecated public static boolean isApiAndPlatformVersionAtLeast(int, int);
     method @Deprecated public static boolean isApiAndPlatformVersionAtLeast(int, int, int);
     method @Deprecated public static boolean isApiVersionAtLeast(int);
@@ -506,11 +506,11 @@ package android.car {
 package android.car.content.pm {
 
   public final class CarPackageManager {
-    method @Deprecated @NonNull public android.car.CarVersion getTargetCarVersion();
+    method @NonNull public android.car.CarVersion getTargetCarVersion();
     method public boolean isActivityDistractionOptimized(String, String);
     method public boolean isPendingIntentDistractionOptimized(@NonNull android.app.PendingIntent);
     method public boolean isServiceDistractionOptimized(String, String);
-    field @Deprecated public static final String MANIFEST_METADATA_TARGET_CAR_VERSION = "android.car.targetCarVersion";
+    field public static final String MANIFEST_METADATA_TARGET_CAR_VERSION = "android.car.targetCarVersion";
   }
 
 }
diff --git a/car-lib/api/lint-baseline.txt b/car-lib/api/lint-baseline.txt
index 1575c6d7b6..968ee36d59 100644
--- a/car-lib/api/lint-baseline.txt
+++ b/car-lib/api/lint-baseline.txt
@@ -317,6 +317,10 @@ UnflaggedApi: android.car.Car#getCarManager(Class<T>):
     New API must be flagged with @FlaggedApi: method android.car.Car.getCarManager(Class<T>)
 UnflaggedApi: android.car.Car#getCarManager(String):
     New API must be flagged with @FlaggedApi: method android.car.Car.getCarManager(String)
+UnflaggedApi: android.car.Car#getCarVersion():
+    New API must be flagged with @FlaggedApi: method android.car.Car.getCarVersion()
+UnflaggedApi: android.car.Car#getPlatformVersion():
+    New API must be flagged with @FlaggedApi: method android.car.Car.getPlatformVersion()
 UnflaggedApi: android.car.Car#isConnected():
     New API must be flagged with @FlaggedApi: method android.car.Car.isConnected()
 UnflaggedApi: android.car.Car#isConnecting():
@@ -1057,6 +1061,10 @@ UnflaggedApi: android.car.VehicleUnit#WATT_HOUR:
     New API must be flagged with @FlaggedApi: field android.car.VehicleUnit.WATT_HOUR
 UnflaggedApi: android.car.content.pm.CarPackageManager:
     New API must be flagged with @FlaggedApi: class android.car.content.pm.CarPackageManager
+UnflaggedApi: android.car.content.pm.CarPackageManager#MANIFEST_METADATA_TARGET_CAR_VERSION:
+    New API must be flagged with @FlaggedApi: field android.car.content.pm.CarPackageManager.MANIFEST_METADATA_TARGET_CAR_VERSION
+UnflaggedApi: android.car.content.pm.CarPackageManager#getTargetCarVersion():
+    New API must be flagged with @FlaggedApi: method android.car.content.pm.CarPackageManager.getTargetCarVersion()
 UnflaggedApi: android.car.content.pm.CarPackageManager#isActivityDistractionOptimized(String, String):
     New API must be flagged with @FlaggedApi: method android.car.content.pm.CarPackageManager.isActivityDistractionOptimized(String,String)
 UnflaggedApi: android.car.content.pm.CarPackageManager#isPendingIntentDistractionOptimized(android.app.PendingIntent):
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index 3543dfa897..05e6bbe484 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -606,7 +606,7 @@ package android.car.content.pm {
   }
 
   public final class CarPackageManager {
-    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method public boolean isActivityBackedBySafeActivity(android.content.ComponentName);
     method @FlaggedApi("android.car.feature.display_compatibility") @RequiresPermission(allOf={android.car.Car.PERMISSION_QUERY_DISPLAY_COMPATIBILITY, android.Manifest.permission.QUERY_ALL_PACKAGES}) public boolean requiresDisplayCompat(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Deprecated public void setAppBlockingPolicy(String, android.car.content.pm.CarAppBlockingPolicy, int);
diff --git a/car-lib/api/system-lint-baseline.txt b/car-lib/api/system-lint-baseline.txt
index 2cfe7b02a8..8b47e05437 100644
--- a/car-lib/api/system-lint-baseline.txt
+++ b/car-lib/api/system-lint-baseline.txt
@@ -893,6 +893,10 @@ RegistrationName: android.car.storagemonitoring.CarStorageMonitoringManager#unre
     Listener methods should be named add/remove; was unregisterListener
 
 
+RequiresPermission: android.car.view.WindowManagerHelper#setInputFeatureSpy(android.view.WindowManager.LayoutParams):
+    Method 'setInputFeatureSpy' documentation mentions permissions without declaring @RequiresPermission
+
+
 RethrowRemoteException: android.car.occupantconnection.AbstractReceiverService#forwardPayload(android.car.CarOccupantZoneManager.OccupantZoneInfo, String, android.car.occupantconnection.Payload):
     Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause)
 
@@ -941,6 +945,34 @@ StaticFinalBuilder: android.car.hardware.CarPropertyConfig.Builder:
     Builder must be final: android.car.hardware.CarPropertyConfig.Builder
 
 
+Todo: android.car.VehiclePropertyIds#AP_POWER_BOOTUP_REASON:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#AP_POWER_STATE_REPORT:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#AP_POWER_STATE_REQ:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#DISPLAY_BRIGHTNESS:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#HW_KEY_INPUT:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#OBD2_FREEZE_FRAME:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#OBD2_FREEZE_FRAME_CLEAR:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#OBD2_FREEZE_FRAME_INFO:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#OBD2_LIVE_FRAME:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#PER_DISPLAY_BRIGHTNESS:
+    Documentation mentions 'TODO'
+Todo: android.car.VehiclePropertyIds#VEHICLE_MAP_SERVICE:
+    Documentation mentions 'TODO'
+Todo: android.car.evs.CarEvsManager#startVideoStream(int, android.os.IBinder, java.util.concurrent.Executor, android.car.evs.CarEvsManager.CarEvsStreamCallback):
+    Documentation mentions 'TODO'
+Todo: android.car.telemetry.CarTelemetryManager.MetricsReportCallback#onResult(String, android.os.PersistableBundle, byte[], int):
+    Documentation mentions 'TODO'
+
+
 UnflaggedApi: android.car.AoapService:
     New API must be flagged with @FlaggedApi: class android.car.AoapService
 UnflaggedApi: android.car.AoapService#AoapService():
@@ -1821,6 +1853,8 @@ UnflaggedApi: android.car.content.pm.CarAppBlockingPolicyService#getAppBlockingP
     New API must be flagged with @FlaggedApi: method android.car.content.pm.CarAppBlockingPolicyService.getAppBlockingPolicy()
 UnflaggedApi: android.car.content.pm.CarAppBlockingPolicyService#onBind(android.content.Intent):
     New API must be flagged with @FlaggedApi: method android.car.content.pm.CarAppBlockingPolicyService.onBind(android.content.Intent)
+UnflaggedApi: android.car.content.pm.CarPackageManager#getTargetCarVersion(String):
+    New API must be flagged with @FlaggedApi: method android.car.content.pm.CarPackageManager.getTargetCarVersion(String)
 UnflaggedApi: android.car.content.pm.CarPackageManager#isActivityBackedBySafeActivity(android.content.ComponentName):
     New API must be flagged with @FlaggedApi: method android.car.content.pm.CarPackageManager.isActivityBackedBySafeActivity(android.content.ComponentName)
 UnflaggedApi: android.car.diagnostic.CarDiagnosticEvent:
diff --git a/car-lib/api/test-current.txt b/car-lib/api/test-current.txt
index edbc8dd177..089ca8da9b 100644
--- a/car-lib/api/test-current.txt
+++ b/car-lib/api/test-current.txt
@@ -680,7 +680,7 @@ package android.car.content.pm {
   }
 
   public final class CarPackageManager {
-    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method public boolean isActivityBackedBySafeActivity(android.content.ComponentName);
     method @FlaggedApi("android.car.feature.display_compatibility") @RequiresPermission(allOf={android.car.Car.PERMISSION_QUERY_DISPLAY_COMPATIBILITY, android.Manifest.permission.QUERY_ALL_PACKAGES}) public boolean requiresDisplayCompat(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Deprecated public void setAppBlockingPolicy(String, android.car.content.pm.CarAppBlockingPolicy, int);
diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index 0ad609309e..f47fd7ce18 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -1688,11 +1688,8 @@ public final class Car {
      * <p>Starting on {@link android.os.Build.VERSION_CODES#TIRAMISU Android 13}, the {@code Car}
      * APIs can be upgraded without an OTA, so it's possible that these APIs are higher than the
      * {@link #getPlatformVersion() platform's}.
-     *
-     * @deprecated - use {@code android.os.Build.VERSION#SDK_INT} instead
      */
     @NonNull
-    @Deprecated
     public static android.car.CarVersion getCarVersion() {
         return CAR_VERSION;
     }
@@ -1704,11 +1701,8 @@ public final class Car {
      * <p>Its {@link ApiVersion#getMajorVersion() major version} will be the same as
      * {@link android.os.Build.VERSION#SDK_INT} for released build but will be
      * {@link android.os.Build.VERSION_CODES#CUR_DEVELOPMENT} for platform still under development.
-     *
-     * @deprecated - use {@code android.os.Build.VERSION#SDK_INT} instead
      */
     @NonNull
-    @Deprecated
     public static android.car.PlatformVersion getPlatformVersion() {
         return PLATFORM_VERSION;
     }
diff --git a/car-lib/src/android/car/content/pm/CarPackageManager.java b/car-lib/src/android/car/content/pm/CarPackageManager.java
index b66bac8368..15c9e1ae89 100644
--- a/car-lib/src/android/car/content/pm/CarPackageManager.java
+++ b/car-lib/src/android/car/content/pm/CarPackageManager.java
@@ -175,10 +175,7 @@ public final class CarPackageManager extends CarManagerBase {
      * <p>And for {@link android.os.Build.VERSION_CODES#TIRAMISU Android 13} first update:
      *
      * <code><meta-data android:name="android.car.targetCarVersion" android:value="33:1"/></code>
-     *
-     * @deprecated Car version is no longer supported by the CarService.
      */
-    @Deprecated
     public static final String MANIFEST_METADATA_TARGET_CAR_VERSION =
             "android.car.targetCarVersion";
 
@@ -464,12 +461,10 @@ public final class CarPackageManager extends CarManagerBase {
      * @throws NameNotFoundException If the given package does not exist for the user.
      *
      * @hide
-     * @deprecated CarVersion is no longer supported by the CarService.
      */
     @SystemApi
     @RequiresPermission(Manifest.permission.QUERY_ALL_PACKAGES)
     @NonNull
-    @Deprecated
     public CarVersion getTargetCarVersion(@NonNull String packageName)
             throws NameNotFoundException {
         try {
@@ -493,10 +488,8 @@ public final class CarPackageManager extends CarManagerBase {
      * version} as major and {@code 0} as minor instead.
      *
      * @return targeted Car API version (as defined above)
-     * @deprecated CarVersion is no longer supported by the CarService.
      */
     @NonNull
-    @Deprecated
     public CarVersion getTargetCarVersion() {
         String pkgName = mCar.getContext().getPackageName();
         try {