diff options
| author | 2025-01-09 10:28:12 +0100 | |
|---|---|---|
| committer | 2025-02-06 20:10:44 -0800 | |
| commit | e6d2166ab791b030077c0993e84e04cad5ec7ce2 (patch) | |
| tree | baf34e1a1c9b37a2fc130a1e111f00f4098defaf | |
| parent | 70be04346a0121c735091303c3ace030e4cc8ede (diff) | |
Clean up VDM DRM flag launched in Android 15.
Removed flag: android.companion.virtualdevice.flags.device_aware_drm
#codehealth
Fix: 379646558
Test: presubmit
Flag: EXEMPT cleanup
Change-Id: I523fcd29e3f54339de45caf5e300baa264613ee1
| -rw-r--r-- | core/java/android/companion/virtual/flags/flags.aconfig | 8 | ||||
| -rw-r--r-- | media/jni/android_media_MediaDrm.cpp | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig index 84af84072f1b..7cca1ede76fe 100644 --- a/core/java/android/companion/virtual/flags/flags.aconfig +++ b/core/java/android/companion/virtual/flags/flags.aconfig @@ -64,14 +64,6 @@ flag { } flag { - namespace: "virtual_devices" - name: "device_aware_drm" - description: "Makes MediaDrm APIs device-aware" - bug: "303535376" - is_fixed_read_only: true -} - -flag { namespace: "virtual_devices" name: "enforce_remote_device_opt_out_on_all_virtual_displays" description: "Respect canDisplayOnRemoteDevices on all virtual displays" diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 48cd53dc44d7..d50acd837bf9 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -27,7 +27,6 @@ #include "jni.h" #include <nativehelper/JNIHelp.h> -#include <android_companion_virtualdevice_flags.h> #include <android/companion/virtualnative/IVirtualDeviceManagerNative.h> #include <android/hardware/drm/1.3/IDrmFactory.h> #include <binder/Parcel.h> @@ -46,7 +45,6 @@ using ::android::companion::virtualnative::IVirtualDeviceManagerNative; using ::android::os::PersistableBundle; namespace drm = ::android::hardware::drm; -namespace virtualdevice_flags = android::companion::virtualdevice::flags; namespace android { @@ -1050,11 +1048,6 @@ DrmPlugin::SecurityLevel jintToSecurityLevel(jint jlevel) { } std::vector<int> getVirtualDeviceIds() { - if (!virtualdevice_flags::device_aware_drm()) { - ALOGW("Device-aware DRM flag disabled."); - return std::vector<int>(); - } - sp<IBinder> binder = defaultServiceManager()->checkService(String16("virtualdevice_native")); if (binder != nullptr) { |