Merge "Reland "shipping level 31, target-level 6""
diff --git a/shared/auto/manifest.xml b/shared/auto/manifest.xml
index 60e9a85..06ab750 100644
--- a/shared/auto/manifest.xml
+++ b/shared/auto/manifest.xml
@@ -9,7 +9,7 @@
*/
-->
<!-- Android Auto Embedded specific HALs-->
-<manifest version="1.0" type="device" target-level="5">
+<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.automotive.audiocontrol</name>
<transport>hwbinder</transport>
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 9ae5493..15e1f7b 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -16,8 +16,8 @@
** limitations under the License.
*/
-->
-<manifest version="1.0" type="device" target-level="5">
- <kernel target-level="5" />
+<manifest version="1.0" type="device" target-level="6">
+ <kernel target-level="6" />
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
diff --git a/shared/device.mk b/shared/device.mk
index 6063920..e8bbe74 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -20,7 +20,7 @@
# Enable userspace reboot
$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk)
-PRODUCT_SHIPPING_API_LEVEL := 30
+PRODUCT_SHIPPING_API_LEVEL := 31
PRODUCT_BUILD_BOOT_IMAGE := true
PRODUCT_USE_DYNAMIC_PARTITIONS := true
DISABLE_RILD_OEM_HOOK := true
diff --git a/shared/tv/manifest.xml b/shared/tv/manifest.xml
index 0dc4a45..8aab6ee 100644
--- a/shared/tv/manifest.xml
+++ b/shared/tv/manifest.xml
@@ -16,7 +16,7 @@
** limitations under the License.
*/
-->
-<manifest version="1.0" type="device" target-level="5">
+<manifest version="1.0" type="device">
<!-- FIXME: Implement tv.cec HAL
<hal format="hidl">
<name>android.hardware.tv.cec</name>
