diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 20:08:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 20:08:40 +0000 |
commit | efdc4ca7bbde0410c5880e60bd47039bfdcb545e (patch) | |
tree | b78d79408b4038d62f90c21be9c396f9f95e77d5 | |
parent | 241be6371f151a5d0085a2346703b4b6e656615d (diff) | |
parent | c360838c414f7a198a1fa2750fc52f6bc92e2cf7 (diff) | |
download | car-android13-mainline-conscrypt-release.tar.gz |
Snap for 8746144 from c360838c414f7a198a1fa2750fc52f6bc92e2cf7 to mainline-conscrypt-releaseaml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android13-mainline-conscrypt-release
Change-Id: I79a0e63ca37e769db900471580122b4cf6348842
-rw-r--r-- | common/car_core_hardware.xml | 3 | ||||
-rw-r--r-- | gsi_car_base.mk | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/common/car_core_hardware.xml b/common/car_core_hardware.xml index cdfb7f5..99ff362 100644 --- a/common/car_core_hardware.xml +++ b/common/car_core_hardware.xml @@ -40,6 +40,9 @@ <!-- Notably bluetooth is added to avoid crashing. It does not work in the emulator. --> <feature name="android.hardware.bluetooth" /> + <!-- Indicate support for the Android security model per the CDD. --> + <feature name="android.hardware.security.model.compatible" /> + <!-- basic system services --> <feature name="android.software.telecom" /> <feature name="android.software.voice_recognizers" notLowRam="true" /> diff --git a/gsi_car_base.mk b/gsi_car_base.mk index 79f08f4..3fdfa77 100644 --- a/gsi_car_base.mk +++ b/gsi_car_base.mk @@ -147,6 +147,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ system/priv-app/GarageModeTestApp/GarageModeTestApp.apk \ system/priv-app/LocalMediaPlayer/LocalMediaPlayer.apk \ system/priv-app/NetworkPreferenceApp/NetworkPreferenceApp.apk \ + system/priv-app/RailwayReferenceApp/RailwayReferenceApp.apk \ system/lib64/libcarservicejni.so \ system/bin/android.automotive.telemetryd@1.0 \ system/etc/init/android.automotive.telemetryd@1.0.rc \ |