commit 029aaa6887a86185c451b615fadcfd97b008e9b5
author Dongwon Kang <dwkang@google.com> Wed Mar 30 19:03:34 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 30 19:03:35 2016 +0000
tree 39996c397e097c9e6a2c92a3d9c76ac73b230746
parent 9887c3e252ec0571ee8637310ea9ec2eec118044
parent 2642c846c428e2175337c53e392ad861ce975630

Merge "ResourceManagerService: Send usage only when monitor service is running" into nyc-dev

services/mediaresourcemanager/ResourceManagerService.cpp

diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 64534bf..3ed0189 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -92,7 +92,7 @@
 
 static void notifyResourceGranted(int pid, const Vector<MediaResource> &resources) {
     static const char* const kServiceName = "media_resource_monitor";
-    sp<IBinder> binder = defaultServiceManager()->getService(String16(kServiceName));
+    sp<IBinder> binder = defaultServiceManager()->checkService(String16(kServiceName));
     if (binder != NULL) {
         sp<IMediaResourceMonitor> service = interface_cast<IMediaResourceMonitor>(binder);
         for (size_t i = 0; i < resources.size(); ++i) {
@@ -170,10 +170,7 @@
 }
 
 ResourceManagerService::ResourceManagerService()
-    : mProcessInfo(new ProcessInfo()),
-      mServiceLog(new ServiceLog()),
-      mSupportsMultipleSecureCodecs(true),
-      mSupportsSecureWithNonSecureCodec(true) {}
+    : ResourceManagerService(new ProcessInfo()) {}
 
 ResourceManagerService::ResourceManagerService(sp<ProcessInfoInterface> processInfo)
     : mProcessInfo(processInfo),