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

Commit 6e4e1210 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "Remove DRM IResourceManagerClient on session close" into rvc-dev am: c7c50f47 

Change-Id: I8d7db9b10c3ea8d1281ce7da310a949bf66442bb
parents 791849bf c7c50f47

drm/libmediadrm/DrmSessionManager.cpp

+3 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ bool isEqualSessionId(const Vector<uint8_t> &sessionId1, const Vector<uint8_t> & 
}



sp<DrmSessionManager> DrmSessionManager::Instance() {

    auto drmSessionManager = new DrmSessionManager();

    static sp<DrmSessionManager> drmSessionManager = new DrmSessionManager();

    drmSessionManager->init();

    return drmSessionManager;

}
@@ -163,7 +163,8 @@ void DrmSessionManager::removeSession(const Vector<uint8_t> &sessionId) { 
    }



    auto info = it->second;

    mService->removeResource(info.pid, info.clientId, toResourceVec(sessionId, INT64_MAX));

    // removeClient instead of removeSession because each client has only one session

    mService->removeClient(info.pid, info.clientId);

    mSessionMap.erase(it);

}