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

Commit fe795dc9 authored by Girish Shetty's avatar Girish Shetty Committed by Automerger Merge Worker
Browse files

Merge "resourcemanager: move common code into different source." into main am:... 

Merge "resourcemanager: move common code into different source." into main am: 5ea9732f am: 893c649d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2837481



Change-Id: Iec3bac24b15e64f8f6f192fbda70deaff87853d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69229d96 893c649d

media/libmediaplayerservice/tests/DrmSessionManager_test.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -148,8 +148,8 @@ static const std::vector<uint8_t> kTestSessionId3{9, 0}; 
class DrmSessionManagerTest : public ::testing::Test {

class DrmSessionManagerTest : public ::testing::Test {

public:

public:

    DrmSessionManagerTest()

    DrmSessionManagerTest()

        : mService(::ndk::SharedRefBase::make<ResourceManagerService>

        : mService(ResourceManagerService::Create(

            (new FakeProcessInfo(), new FakeSystemCallback())),

                  new FakeProcessInfo(), new FakeSystemCallback())),

          mDrmSessionManager(new DrmSessionManager(mService)),

          mDrmSessionManager(new DrmSessionManager(mService)),

          mTestDrm1(::ndk::SharedRefBase::make<FakeDrm>(

          mTestDrm1(::ndk::SharedRefBase::make<FakeDrm>(

                  kTestSessionId1, mDrmSessionManager)),

                  kTestSessionId1, mDrmSessionManager)),

services/mediaresourcemanager/ResourceManagerService.cpp

+92 −211

File changed.

Preview size limit exceeded, changes collapsed.

services/mediaresourcemanager/ResourceManagerService.h

+22 −62

File changed.

Preview size limit exceeded, changes collapsed.

services/mediaresourcemanager/ResourceManagerServiceUtils.cpp

+122 −15

File changed.

Preview size limit exceeded, changes collapsed.

services/mediaresourcemanager/ResourceManagerServiceUtils.h

+143 −5

File changed.

Preview size limit exceeded, changes collapsed.