summaryrefslogtreecommitdiffstats
path: root/src/com/android/server/telecom/HeadsetMediaButtonFactory.java
diff options
context:
space:
mode:
authorIhab Awad <ihab@google.com>2015-05-19 09:23:21 -0700
committerIhab Awad <ihab@google.com>2015-05-19 12:04:37 -0700
commit731369c3983628e700f161138fe2ea3230033a1a (patch)
tree97e81f8ca36cf76fdbc8e4ea754aebaefb34fb69 /src/com/android/server/telecom/HeadsetMediaButtonFactory.java
parentcd9e3e9fb3c30cffc525324c274c77f83f7c2c55 (diff)
downloadandroid_packages_services_Telecomm-731369c3983628e700f161138fe2ea3230033a1a.tar.gz
android_packages_services_Telecomm-731369c3983628e700f161138fe2ea3230033a1a.tar.bz2
android_packages_services_Telecomm-731369c3983628e700f161138fe2ea3230033a1a.zip
Sync for HeadsetMediaButton
Add synchronization and deferred execution to our interactions with MediaSession, since MediaSession sometimes calls back via an RPC into Telecom and can cause us to deadlock. Bug: 21028885 Change-Id: I8fc0574269a81e817e1c139aa0fe56258c96bd64
Diffstat (limited to 'src/com/android/server/telecom/HeadsetMediaButtonFactory.java')
-rw-r--r--src/com/android/server/telecom/HeadsetMediaButtonFactory.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/server/telecom/HeadsetMediaButtonFactory.java b/src/com/android/server/telecom/HeadsetMediaButtonFactory.java
index becabbff..13d5e4f8 100644
--- a/src/com/android/server/telecom/HeadsetMediaButtonFactory.java
+++ b/src/com/android/server/telecom/HeadsetMediaButtonFactory.java
@@ -16,6 +16,8 @@
package com.android.server.telecom;
+import com.android.server.telecom.components.TelecomService;
+
import android.content.Context;
/**
@@ -27,5 +29,8 @@ import android.content.Context;
*/
public interface HeadsetMediaButtonFactory {
- HeadsetMediaButton create(Context context, CallsManager callsManager);
+ HeadsetMediaButton create(
+ Context context,
+ CallsManager callsManager,
+ TelecomSystem.SyncRoot lock);
}