Snap for 10447354 from 35c61611edc02794de5d79f43a363d0772b73f59 to mainline-wifi-release
Change-Id: I31edec23fb4afe67a4a5a4c4f52b3a13ce055897
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index 847f781..73d39a9 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -8,14 +8,6 @@
</interface>
</hal>
<hal format="hidl" optional="false">
- <name>android.frameworks.schedulerservice</name>
- <version>1.0</version>
- <interface>
- <name>ISchedulingPolicyService</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="false">
<name>android.frameworks.sensorservice</name>
<version>1.0</version>
<interface>
diff --git a/device.mk b/device.mk
index ed2122a..60722fd 100644
--- a/device.mk
+++ b/device.mk
@@ -27,7 +27,7 @@
# Adjust the dalvik heap to be appropriate for a tablet.
$(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
-PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_SHIPPING_API_LEVEL := 32
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
# Set custom settings
@@ -64,6 +64,17 @@
TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL)
PRODUCT_COPY_FILES += $(LOCAL_KERNEL):kernel
+#
+# Power HAL
+#
+PRODUCT_PACKAGES += \
+ android.hardware.power-service.example
+#
+# PowerStats HAL
+#
+PRODUCT_PACKAGES += \
+ android.hardware.power.stats-service.example
+
# Graphics
PRODUCT_PACKAGES += \
android.hardware.graphics.allocator@2.0-impl \
@@ -72,10 +83,12 @@
android.hardware.graphics.mapper@2.0-service \
android.hardware.graphics.composer@2.1-impl \
android.hardware.graphics.composer@2.1-service \
- android.hardware.boot@1.0-impl:64 \
- android.hardware.boot@1.0-service \
+ android.hardware.boot@1.2-impl:64 \
+ android.hardware.boot@1.2-impl.recovery:64 \
+ android.hardware.boot@1.2-service \
android.hardware.fastboot@1.0 \
android.hardware.fastboot@1.0-impl-mock \
+ modetest \
libdrm \
libdrm_omap \
gralloc.am57x \
@@ -106,8 +119,9 @@
PRODUCT_PACKAGES += \
android.hardware.keymaster@3.0-impl \
android.hardware.keymaster@3.0-service \
- android.hardware.drm@1.0-impl \
- android.hardware.drm@1.0-service \
+ android.hardware.drm@1.3-service.clearkey \
+ android.hardware.drm@1.3-service.widevine \
+
# Audio
PRODUCT_PACKAGES += \
@@ -126,10 +140,6 @@
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
-# Memtrack
-PRODUCT_PACKAGES += \
- android.hardware.memtrack@1.0-impl \
- android.hardware.memtrack@1.0-service \
PRODUCT_PROPERTY_OVERRIDES += \
ro.opengles.version=131072 \
diff --git a/manifest.xml b/manifest.xml
index 5e1c19c..1b535ec 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="3">
+<manifest version="1.0" type="device" target-level="6">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
@@ -18,18 +18,9 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.configstore</name>
- <transport>hwbinder</transport>
- <version>1.1</version>
- <interface>
- <name>ISurfaceFlingerConfigs</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.drm</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.3</version>
<interface>
<name>ICryptoFactory</name>
<instance>default</instance>
@@ -60,7 +51,7 @@
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
- <version>2.0</version>
+ <version>2.1</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
@@ -88,22 +79,4 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.memtrack</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IMemtrack</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.boot</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IBootControl</name>
- <instance>default</instance>
- </interface>
- </hal>
</manifest>