LineageOS/android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let getOriginalMimeType() take a fd passed from drm java applications

Browse Source 
This patch enables the drm framework to avoid opening files directly.
As a result, the drm framework no longer needs the sdcard read permision.

o related-to-bug: 6426185

Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
This commit is contained in:
James Dong
2012-07-30 17:57:39 -07:00
parent b3e12a4d15
commit bf5b3b29e3
19 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drm/common/IDrmManagerService.cpp
View File

@@ -368,13 +368,18 @@ status_t BpDrmManagerService::saveRights(
return reply.readInt32();
}
String8 BpDrmManagerService::getOriginalMimeType(int uniqueId, const String8& path) {
String8 BpDrmManagerService::getOriginalMimeType(int uniqueId, const String8& path, int fd) {
ALOGV("Get Original MimeType");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
data.writeString8(path);
int32_t isFdValid = (fd >= 0);
data.writeInt32(isFdValid);
if (isFdValid) {
data.writeFileDescriptor(fd);
}
remote()->transact(GET_ORIGINAL_MIMETYPE, data, &reply);
return reply.readString8();
@@ -1067,7 +1072,12 @@ status_t BnDrmManagerService::onTransact(
const int uniqueId = data.readInt32();
const String8 path = data.readString8();
const String8 originalMimeType = getOriginalMimeType(uniqueId, path);
const int32_t isFdValid = data.readInt32();
int fd = -1;
if (isFdValid) {
fd = data.readFileDescriptor();
}
const String8 originalMimeType = getOriginalMimeType(uniqueId, path, fd);
reply->writeString8(originalMimeType);
return DRM_NO_ERROR;