From ed849b8266824d4c5df15466e5c02e1471192461 Mon Sep 17 00:00:00 2001
From: Warren Rehman <wrehman@google.com>
Date: Thu, 5 Mar 2015 15:26:12 +0900
Subject: Defensively check for batterystats service instead of blocking to get
 it.

bug: 19189826
Change-Id: I656e863eb68edf22812eb380ec6cd4105f4000aa

 On branch checkbattstats
 Changes to be committed:
	modified:   MediaPlayerService.cpp
---
 media/libmediaplayerservice/MediaPlayerService.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'media')

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 0b18ae0..3e49e33 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -290,8 +290,9 @@ MediaPlayerService::MediaPlayerService()
     const sp<IServiceManager> sm(defaultServiceManager());
     if (sm != NULL) {
         const String16 name("batterystats");
+        // use checkService() to avoid blocking if service is not up yet
         sp<IBatteryStats> batteryStats =
-                interface_cast<IBatteryStats>(sm->getService(name));
+                interface_cast<IBatteryStats>(sm->checkService(name));
         if (batteryStats != NULL) {
             batteryStats->noteResetVideo();
             batteryStats->noteResetAudio();
-- 
cgit v1.1