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

Commit bfc18313 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Update how drm file descriptors are passed through framework" into nyc-dev am: 613aae14 

am: 5f9a7eb4

* commit '5f9a7eb4':
  Update how drm file descriptors are passed through framework

Change-Id: I7de6b708f56e17273f1191dac430972b0b241781
parents 3f4b7255 5f9a7eb4

drm/common/IDrmManagerService.cpp

+3 −1
Original line number Diff line number Diff line
@@ -303,7 +303,9 @@ DrmInfo* BpDrmManagerService::acquireDrmInfo(int uniqueId, const DrmInfoRequest* 
        const String8 value = drmInforequest->get(key);

        if (key == String8("FileDescriptorKey")) {

            int fd = -1;

            sscanf(value.string(), "FileDescriptor[%d]", &fd);

            if (sscanf(value.string(), "FileDescriptor[%d]", &fd) != 1) {

                sscanf(value.string(), "%d", &fd);

            }

            data.writeFileDescriptor(fd);

        } else {

            data.writeString8((value == String8("")) ? String8("NULL") : value);