commit 00c8254cb5409ed220a393737f534f8355ab7232
author Marvin Ramin <marvinramin@google.com> Mon Mar 18 16:03:03 2024 +0100
committer Marvin Ramin <marvinramin@google.com> Wed Apr 17 17:32:51 2024 +0200
tree 7039a708e74e3fab8413e71a6c90723c1a6c4a6a
parent 048114ad05fcf6e87d43441ec2f16f4162473f97

Make MediaDrm device-aware

Cap DRM sessions at max. SW_SECURE_CRYPTO security level for sessions opened by
applications that are currently visible on a Virtual Device.

Goal is to ensure applications do not get misled that full hw backed DRM is available
(which it generally would be on the host device). As virtual devices
operate with virtual displays hw backed DRM will not be available and we now report
it as such for applications.

Bug: 306374719
Test: atest VirtualDeviceDrmTest
Change-Id: I55acb7d15e19611a702492c71dccce2f973fd37c

media/jni/Android.bp

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index 94fce79..8609c4d 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -82,6 +82,7 @@
         "libhidlbase",
         "libsonivox",
         "server_configurable_flags",
+        "android.companion.virtual.virtualdevice_aidl-cpp",
         "android.hardware.cas@1.0",
         "android.hardware.cas.native@1.0",
         "android.hardware.drm@1.3",
@@ -100,6 +101,7 @@
     static_libs: [
         "libgrallocusage",
         "libmedia_midiiowrapper",
+        "android.companion.virtualdevice.flags-aconfig-cc",
         "android.media.playback.flags-aconfig-cc",
     ],