Revert "Disable Setup Wizard at build time instead of boot"
am: 2f5383a140
Change-Id: Ib82d39f631e2003c6bb477400c848000905ea5a8
diff --git a/Android.bp b/Android.bp
index cb7d5ea..d3a2a66 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,7 +31,7 @@
cc_defaults {
name: "enabled_on_q_internal_and_later",
- enabled: false
+ enabled: true
}
cc_defaults {
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 96611c9..3c44a6a 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -20,7 +20,7 @@
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
- <version>4.0</version>
+ <version>5.0</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
@@ -29,7 +29,7 @@
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
- <version>4.0</version>
+ <version>5.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>
@@ -103,15 +103,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.gnss</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IGnss</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
<version>2.0</version>
@@ -195,15 +186,6 @@
<fqname>@1.4::IRadio/slot1</fqname>
</hal>
<hal format="hidl">
- <name>android.hardware.sensors</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>ISensors</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.usb</name>
<transport>hwbinder</transport>
<version>1.0</version>
diff --git a/shared/device.mk b/shared/device.mk
index 1a1c9db..16f3d80 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -127,6 +127,7 @@
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
+ frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml \
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \
frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
@@ -181,6 +182,12 @@
# Packages for HAL implementations
#
+# Atrace HAL
+#
+PRODUCT_PACKAGES += \
+ android.hardware.atrace@1.0-service
+
+#
# Hardware Composer HAL
#
PRODUCT_PACKAGES += \
@@ -214,8 +221,8 @@
PRODUCT_PACKAGES += \
audio.primary.cutf \
audio.r_submix.default \
- android.hardware.audio@4.0-impl:32 \
- android.hardware.audio.effect@4.0-impl:32 \
+ android.hardware.audio@5.0-impl:32 \
+ android.hardware.audio.effect@5.0-impl:32 \
android.hardware.audio@2.0-service \
android.hardware.soundtrigger@2.0-impl \
@@ -254,9 +261,7 @@
# GPS
#
PRODUCT_PACKAGES += \
- gps.cutf \
- android.hardware.gnss@1.0-impl \
- android.hardware.gnss@1.0-service
+ android.hardware.gnss@2.0-service
# Health
PRODUCT_PACKAGES += \
@@ -270,9 +275,12 @@
# Sensors
#
PRODUCT_PACKAGES += \
- sensors.cutf \
- android.hardware.sensors@1.0-impl \
- android.hardware.sensors@1.0-service
+ android.hardware.sensors@2.0-service.mock
+#
+# Thermal (mock)
+#
+PRODUCT_PACKAGES += \
+ android.hardware.thermal@2.0-service.mock
#
# Lights
@@ -319,8 +327,9 @@
PRODUCT_PACKAGES += \
android.hardware.usb@1.0-service
-# TODO vibrator HAL
-# TODO thermal
+# Vibrator HAL
+PRODUCT_PACKAGES += \
+ android.hardware.vibrator@1.3-service.example
PRODUCT_PACKAGES += \
cuttlefish_dtb
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index fe53fd2..b79a594 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -41,11 +41,13 @@
/vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.mock u:object_r:hal_power_stats_default_exec:s0
/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service\.sim u:object_r:hal_bluetooth_sim_exec:s0
/vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service\.cuttlefish u:object_r:hal_dumpstate_impl_exec:s0
-/vendor/bin/hw/android\.hardware\.health@2\.0-service.cuttlefish u:object_r:hal_health_default_exec:s0
-/vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service.cuttlefish u:object_r:hal_health_storage_default_exec:s0
+/vendor/bin/hw/android\.hardware\.health@2\.0-service\.cuttlefish u:object_r:hal_health_default_exec:s0
+/vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service\.cuttlefish u:object_r:hal_health_storage_default_exec:s0
/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0
+/vendor/bin/hw/android\.hardware\.vibrator@1\.3-service\.example u:object_r:hal_vibrator_default_exec:s0
/vendor/bin/ip_link_add u:object_r:ip_link_add_exec:s0
/vendor/bin/setup_wifi u:object_r:setup_wifi_exec:s0
+/vendor/bin/hw/android\.hardware\.sensors@2\.0-service\.mock u:object_r:hal_sensors_default_exec:s0
/vendor/bin/hw/android\.hardware\.thermal@2\.0-service\.mock u:object_r:hal_thermal_default_exec:s0
/vendor/lib(64)?/cuttlefish_auto_resources.so u:object_r:same_process_hal_file:s0