summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-10-27 19:20:02 -0400
committerThe Android Automerger <android-build@google.com>2014-10-27 20:29:57 -0700
commitba35a77c7c4494c9eb74e87d8eaa9a7205c426d2 (patch)
tree35e8c24cb41df9dba4aadc196145d37ab0fcfbea
parent60e46f609b6b0d03d87c3d631f423a859034edd0 (diff)
downloadbase-ba35a77c7c4494c9eb74e87d8eaa9a7205c426d2.tar.gz
Add missing passive discovery flagandroid-5.0.0_r2android-5.0.0_r1
MediaProjectionManagerService had an active media callback which was causing a service to be bound 100% of the time. Adding a passive flag makes it only observe events, and allow the service to only be bound when needed by apps requesting active discovery. Bug: 18042409 Bug: 17969854 Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
-rw-r--r--services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
index cdfb656f439e..531d20a12f9e 100644
--- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
+++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
@@ -91,7 +91,8 @@ public final class MediaProjectionManagerService extends SystemService
public void onStart() {
publishBinderService(Context.MEDIA_PROJECTION_SERVICE, new BinderService(),
false /*allowIsolated*/);
- mMediaRouter.addCallback(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, mMediaRouterCallback);
+ mMediaRouter.addCallback(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY, mMediaRouterCallback,
+ MediaRouter.CALLBACK_FLAG_PASSIVE_DISCOVERY);
}
@Override