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

Commit 2e0001dd authored by Jeff Tinker's avatar Jeff Tinker Committed by Android Git Automerger
Browse files

am 437aa4c5: Merge "Allow DRM client to pass the FD of an open file to the DRM... 

am 437aa4c5: Merge "Allow DRM client to pass the FD of an open file to the DRM server." into jb-mr1-dev

* commit '437aa4c5':
  Allow DRM client to pass the FD of an open file to the DRM server.
parents 52885466 437aa4c5

drm/common/IDrmManagerService.cpp

+16 −4
Original line number Diff line number Diff line
@@ -310,8 +310,14 @@ DrmInfo* BpDrmManagerService::acquireDrmInfo(int uniqueId, const DrmInfoRequest* 
        const String8 key = keyIt.next();

        data.writeString8(key);

        const String8 value = drmInforequest->get(key);

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

            int fd = -1;

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

            data.writeFileDescriptor(fd);

        } else {

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

        }

    }



    remote()->transact(ACQUIRE_DRM_INFO, data, &reply);
@@ -1002,9 +1008,16 @@ status_t BnDrmManagerService::onTransact( 
        const int size = data.readInt32();

        for (int index = 0; index < size; ++index) {

            const String8 key(data.readString8());

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

                char buffer[16];

                int fd = data.readFileDescriptor();

                sprintf(buffer, "%lu", (unsigned long)fd);

                drmInfoRequest->put(key, String8(buffer));

            } else {

                const String8 value(data.readString8());

                drmInfoRequest->put(key, (value == String8("NULL")) ? String8("") : value);

            }

        }



        DrmInfo* drmInfo = acquireDrmInfo(uniqueId, drmInfoRequest);
@@ -1505,4 +1518,3 @@ status_t BnDrmManagerService::onTransact( 
        return BBinder::onTransact(code, data, reply, flags);

    }

}