Merge "Start MediaResourceMonitorService only when needed." into nyc-dev

2016-03-30 19:03:42 +00:00
parent 92e1ea2383 d8b81b3444
commit 840172ac1e
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1132,7 +1132,9 @@ public final class SystemServer {
                mSystemServiceManager.startService(TvInputManagerService.class);
            }

-            mSystemServiceManager.startService(MediaResourceMonitorService.class);
+            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+                mSystemServiceManager.startService(MediaResourceMonitorService.class);
+            }

            if (!disableNonCoreServices) {
                traceBeginAndSlog("StartMediaRouterService");