commit d8b81b344405c6a0c2dfccc229c892fb3d8e0d56
author Dongwon Kang <dwkang@google.com> Wed Mar 23 18:04:19 2016 -0700
committer Dongwon Kang <dwkang@google.com> Mon Mar 28 11:18:57 2016 -0700
tree 7f8312175a16dae5a3ab3606c5732fed02a48bfd
parent 197823da52a44422890667e21c17c28ab76e64b7

Start MediaResourceMonitorService only when needed.

Bug:26564748
Change-Id: I5951008f403a11588dd84fb8dfc705c47bdca169

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 5975405..244a6ec 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1129,7 +1129,9 @@
                 mSystemServiceManager.startService(TvInputManagerService.class);
             }
 
-            mSystemServiceManager.startService(MediaResourceMonitorService.class);
+            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+                mSystemServiceManager.startService(MediaResourceMonitorService.class);
+            }
 
             if (!disableNonCoreServices) {
                 traceBeginAndSlog("StartMediaRouterService");