commit 7ad2854adc0abe8dd7909a6ed401107ad09bc3d2
author Chih-Hung Hsieh <chh@google.com> Wed Aug 10 10:18:32 2016 -0700
committer Chih-Hung Hsieh <chh@google.com> Wed Aug 10 10:18:32 2016 -0700
tree d94dc88d14ace505e7230fe79e78e00cbab1520c
parent aee0669a7bdc1502a5e3d0752aaf84b0354a005e
parent 1c10de5b7bafaa7886bf6c9f61d435aeb2b1e7f4

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

Change-Id: I1e395ecb96524c18348b9f65c96d60c9eae9be45

services/mediaresourcemanager/ResourceManagerService.cpp

diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 3ed0189..7346f51 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -43,7 +43,7 @@
     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 @@
     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 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) {