summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/media/projection
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-08-25 17:52:06 -0400
committerJohn Spurlock <jspurlock@google.com>2014-08-25 17:55:08 -0400
commit78b8c8fbde12b214314cc2ab2644350b5d5189a5 (patch)
tree0b232017fed212e835e2906dc32201e99cc8cdb2 /services/core/java/com/android/server/media/projection
parent6adf1588fd2bccb8cf95a9c3456230bba805fab9 (diff)
downloadframeworks_base-78b8c8fbde12b214314cc2ab2644350b5d5189a5.zip
frameworks_base-78b8c8fbde12b214314cc2ab2644350b5d5189a5.tar.gz
frameworks_base-78b8c8fbde12b214314cc2ab2644350b5d5189a5.tar.bz2
QS: Wire up screen casting to tile/panel.
Use MediaProjectionManager to determine whether or not screencasting is active, when it changes, and to stop casting. Also: - Implement hashCode/equals on MediaProjectionInfo - Fix unintentional recursion in the service. Bug:16488053 Change-Id: Icd1a88f23bbdf1d4c1915b30cb2508f8fe9d6d7e
Diffstat (limited to 'services/core/java/com/android/server/media/projection')
-rw-r--r--services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java3
1 files changed, 1 insertions, 2 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 69d1dc9..8ec9b25 100644
--- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
+++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
@@ -111,7 +111,6 @@ public final class MediaProjectionManagerService extends SystemService
@Override
public void binderDied() {
synchronized (mLock) {
- unlinkDeathRecipientLocked(callback);
removeCallback(callback);
}
}
@@ -125,7 +124,7 @@ public final class MediaProjectionManagerService extends SystemService
private void removeCallback(IMediaProjectionWatcherCallback callback) {
synchronized (mLock) {
unlinkDeathRecipientLocked(callback);
- removeCallback(callback);
+ mCallbackDelegate.remove(callback);
}
}