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

Commit b8750e11 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

resolve merge conflicts of 1c10de5b to stage-aosp-master 

am: 7ad2854a

Change-Id: I3779e9173a0d81e1e1be55dd069b520cdf854c14
parents adc67b20 7ad2854a

services/mediaresourcemanager/ResourceManagerService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static String8 getString(const Vector<T> &items) { 
    return itemsStr;

}



static bool hasResourceType(MediaResource::Type type, Vector<MediaResource> resources) {

static bool hasResourceType(MediaResource::Type type, const Vector<MediaResource>& resources) {

    for (size_t i = 0; i < resources.size(); ++i) {

        if (resources[i].mType == type) {

            return true;
@@ -52,7 +52,7 @@ static bool hasResourceType(MediaResource::Type type, Vector<MediaResource> reso 
    return false;

}



static bool hasResourceType(MediaResource::Type type, ResourceInfos infos) {

static bool hasResourceType(MediaResource::Type type, const ResourceInfos& infos) {

    for (size_t i = 0; i < infos.size(); ++i) {

        if (hasResourceType(type, infos[i].resources)) {

            return true;
@@ -76,7 +76,7 @@ static ResourceInfos& getResourceInfosForEdit( 


static ResourceInfo& getResourceInfoForEdit(

        int64_t clientId,

        const sp<IResourceManagerClient> client,

        const sp<IResourceManagerClient>& client,

        ResourceInfos& infos) {

    for (size_t i = 0; i < infos.size(); ++i) {

        if (infos[i].clientId == clientId) {

services/mediaresourcemanager/ResourceManagerService.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public: 
    virtual status_t dump(int fd, const Vector<String16>& args);



    ResourceManagerService();

    ResourceManagerService(sp<ProcessInfoInterface> processInfo);

    explicit ResourceManagerService(sp<ProcessInfoInterface> processInfo);



    // IResourceManagerService interface

    virtual void config(const Vector<MediaResourcePolicy> &policies);

services/mediaresourcemanager/ServiceLog.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace android { 
class ServiceLog : public RefBase {

public:

    ServiceLog();

    ServiceLog(size_t maxNum);

    explicit ServiceLog(size_t maxNum);



    void add(const String8 &log);

    String8 toString(const char *linePrefix = NULL) const;

services/mediaresourcemanager/test/ResourceManagerService_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


namespace android {



static int64_t getId(sp<IResourceManagerClient> client) {

static int64_t getId(const sp<IResourceManagerClient>& client) {

    return (int64_t) client.get();

}