commit 4313f160c8fb376643079b5507f7f3b4e2e3c382
author John Stultz <john.stultz@linaro.org> Thu Jul 08 18:24:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 08 18:24:35 2021 +0000
tree 68ece367a993c4d0384725232dea3962776f5a44
parent d357e6510d209857ebbe20cc01efbf1c2bbb5682
parent d9b540e0287ba0f3031f0ed895bf8379f167ab1a

db845c: Update PRODUCT_SHIPPING_API_LEVEL to 30 and FCM to 5 am: d9b540e028

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1754432

Change-Id: Idd368796c1ba5f555cbec3706b03bb2b77bf9ec8

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 8084584..a996c4f 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -23,7 +23,7 @@
 # Build and run only ART
 PRODUCT_RUNTIMES := runtime_libart_default
 
-PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_SHIPPING_API_LEVEL := 30
 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
 
 # Enable Scoped Storage related
@@ -44,8 +44,8 @@
 
 # Display
 PRODUCT_PACKAGES += \
-    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 \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.composer@2.2-impl \
@@ -91,6 +91,19 @@
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
 
+#
+# Power HAL
+#
+PRODUCT_PACKAGES += \
+    android.hardware.power-service.example
+
+#
+# PowerStats HAL
+#
+PRODUCT_PACKAGES += \
+    android.hardware.power.stats-service.example
+
+
 # Audio
 PRODUCT_PACKAGES += \
     android.hardware.audio.service \

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 2542348..877987b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="4">
+<manifest version="1.0" type="device" target-level="5">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
@@ -36,18 +36,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>