DrmSessionManager: use ndk resourcemanager
Bug: 134787536
Bug: 144588885
Test: DrmSessionManagerTest
Test: DrmSessionManager_test
Test: MediaDrmClearkeyTest.testGetNumberOfSessions
Test: WidevineGenericOpsTests.testL1
Change-Id: I2d0bf13d41b32fb5f17e097c0097c1c596c7ab2f
diff --git a/drm/libmediadrm/DrmSessionManager.cpp b/drm/libmediadrm/DrmSessionManager.cpp
index 165a4d6..7a4e1ae 100644
--- a/drm/libmediadrm/DrmSessionManager.cpp
+++ b/drm/libmediadrm/DrmSessionManager.cpp
@@ -18,13 +18,12 @@
#define LOG_TAG "DrmSessionManager"
#include <utils/Log.h>
-#include <android/media/IResourceManagerClient.h>
-#include <android/media/IResourceManagerService.h>
-#include <binder/IPCThreadState.h>
-#include <binder/IProcessInfoService.h>
-#include <binder/IServiceManager.h>
+#include <aidl/android/media/IResourceManagerClient.h>
+#include <aidl/android/media/IResourceManagerService.h>
+#include <aidl/android/media/MediaResourceParcel.h>
+#include <android/binder_ibinder.h>
+#include <android/binder_manager.h>
#include <cutils/properties.h>
-#include <media/MediaResource.h>
#include <mediadrm/DrmUtils.h>
#include <mediadrm/DrmSessionManager.h>
#include <unistd.h>
@@ -32,10 +31,18 @@
#include <vector>
-#include "ResourceManagerService.h"
-
namespace android {
-using android::binder::Status;
+
+using aidl::android::media::MediaResourceParcel;
+
+namespace {
+void ResourceManagerServiceDied(void* cookie) {
+ auto thiz = static_cast<DrmSessionManager*>(cookie);
+ thiz->binderDied();
+}
+}
+
+using ::ndk::ScopedAStatus;
static String8 GetSessionIdString(const Vector<uint8_t> &sessionId) {
String8 sessionIdStr;
@@ -45,34 +52,28 @@
return sessionIdStr;
}
-static std::vector<uint8_t> toStdVec(const Vector<uint8_t> &vector) {
- const uint8_t *v = vector.array();
- std::vector<uint8_t> vec(v, v + vector.size());
+template <typename Byte = uint8_t>
+static std::vector<Byte> toStdVec(const Vector<uint8_t> &vector) {
+ auto v = reinterpret_cast<const Byte *>(vector.array());
+ std::vector<Byte> vec(v, v + vector.size());
return vec;
}
-static uint64_t toClientId(const sp<IResourceManagerClient>& drm) {
- return reinterpret_cast<int64_t>(drm.get());
-}
-
static std::vector<MediaResourceParcel> toResourceVec(
const Vector<uint8_t> &sessionId, int64_t value) {
+ using Type = aidl::android::media::MediaResourceType;
+ using SubType = aidl::android::media::MediaResourceSubType;
std::vector<MediaResourceParcel> resources;
- resources.push_back(MediaResource::DrmSessionResource(toStdVec(sessionId), value));
+ MediaResourceParcel resource{
+ Type::kDrmSession, SubType::kUnspecifiedSubType,
+ toStdVec<int8_t>(sessionId), value};
+ resources.push_back(resource);
return resources;
}
-static sp<IResourceManagerService> getResourceManagerService() {
- if (DrmUtils::UseDrmService()) {
- // Create ResourceManagerService object in mediadrmserver process
- return new android::media::ResourceManagerService();
- }
- sp<IServiceManager> sm = defaultServiceManager();
- if (sm == NULL) {
- return NULL;
- }
- sp<IBinder> binder = sm->getService(String16("media.resource_manager"));
- return interface_cast<IResourceManagerService>(binder);
+static std::shared_ptr<IResourceManagerService> getResourceManagerService() {
+ ::ndk::SpAIBinder binder(AServiceManager_getService("media.resource_manager"));
+ return IResourceManagerService::fromBinder(binder);
}
bool isEqualSessionId(const Vector<uint8_t> &sessionId1, const Vector<uint8_t> &sessionId2) {
@@ -88,7 +89,7 @@
}
sp<DrmSessionManager> DrmSessionManager::Instance() {
- static sp<DrmSessionManager> drmSessionManager = new DrmSessionManager();
+ auto drmSessionManager = new DrmSessionManager();
drmSessionManager->init();
return drmSessionManager;
}
@@ -97,9 +98,10 @@
: DrmSessionManager(getResourceManagerService()) {
}
-DrmSessionManager::DrmSessionManager(const sp<IResourceManagerService> &service)
+DrmSessionManager::DrmSessionManager(const std::shared_ptr<IResourceManagerService> &service)
: mService(service),
- mInitialized(false) {
+ mInitialized(false),
+ mDeathRecipient(AIBinder_DeathRecipient_new(ResourceManagerServiceDied)) {
if (mService == NULL) {
ALOGE("Failed to init ResourceManagerService");
}
@@ -107,7 +109,7 @@
DrmSessionManager::~DrmSessionManager() {
if (mService != NULL) {
- IInterface::asBinder(mService)->unlinkToDeath(this);
+ AIBinder_unlinkToDeath(mService->asBinder().get(), mDeathRecipient.get(), this);
}
}
@@ -118,13 +120,13 @@
}
mInitialized = true;
if (mService != NULL) {
- IInterface::asBinder(mService)->linkToDeath(this);
+ AIBinder_linkToDeath(mService->asBinder().get(), mDeathRecipient.get(), this);
}
}
void DrmSessionManager::addSession(int pid,
- const sp<IResourceManagerClient>& drm, const Vector<uint8_t> &sessionId) {
- uid_t uid = IPCThreadState::self()->getCallingUid();
+ const std::shared_ptr<IResourceManagerClient>& drm, const Vector<uint8_t> &sessionId) {
+ uid_t uid = AIBinder_getCallingUid();
ALOGV("addSession(pid %d, uid %d, drm %p, sessionId %s)", pid, uid, drm.get(),
GetSessionIdString(sessionId).string());
@@ -133,9 +135,9 @@
return;
}
- int64_t clientId = toClientId(drm);
+ static int64_t clientId = 0;
mSessionMap[toStdVec(sessionId)] = (SessionInfo){pid, uid, clientId};
- mService->addResource(pid, uid, clientId, drm, toResourceVec(sessionId, INT64_MAX));
+ mService->addResource(pid, uid, clientId++, drm, toResourceVec(sessionId, INT64_MAX));
}
void DrmSessionManager::useSession(const Vector<uint8_t> &sessionId) {
@@ -170,7 +172,7 @@
// unlock early because reclaimResource might callback into removeSession
mLock.lock();
- sp<IResourceManagerService> service(mService);
+ std::shared_ptr<IResourceManagerService> service(mService);
mLock.unlock();
if (service == NULL) {
@@ -181,7 +183,7 @@
// we rely on IResourceManagerClient to removeSession in reclaimResource
Vector<uint8_t> dummy;
bool success;
- Status status = service->reclaimResource(callingPid, toResourceVec(dummy, INT64_MAX), &success);
+ ScopedAStatus status = service->reclaimResource(callingPid, toResourceVec(dummy, INT64_MAX), &success);
return status.isOk() && success;
}
@@ -195,10 +197,10 @@
return mSessionMap.count(toStdVec(sessionId));
}
-void DrmSessionManager::binderDied(const wp<IBinder>& /*who*/) {
+void DrmSessionManager::binderDied() {
ALOGW("ResourceManagerService died.");
Mutex::Autolock lock(mLock);
- mService.clear();
+ mService.reset();
}
} // namespace android