Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 857fb877 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up VDM DRM flag launched in Android 15." into main

parents ee1d0992 e6d2166a

core/java/android/companion/virtual/flags/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@ flag { 
    bug: "320328752"

}



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"

media/jni/android_media_MediaDrm.cpp

+0 −7
Original line number Diff line number Diff line
@@ -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) {