am a1cebc1f: Merge "Fix race in media button intent registration" into jb-mr2-dev

* commit 'a1cebc1f8ae2c4361078e3208ac7fa8c438fcf9c':
  Fix race in media button intent registration
This commit is contained in:
Jean-Michel Trivi
2013-03-14 21:41:04 +00:00
committed by Android Git Automerger

View File

@@ -120,14 +120,14 @@ interface IAudioService {
oneway void dispatchMediaKeyEvent(in KeyEvent keyEvent);
void dispatchMediaKeyEventUnderWakelock(in KeyEvent keyEvent);
oneway void registerMediaButtonIntent(in PendingIntent pi, in ComponentName c);
void registerMediaButtonIntent(in PendingIntent pi, in ComponentName c);
oneway void unregisterMediaButtonIntent(in PendingIntent pi, in ComponentName c);
oneway void registerMediaButtonEventReceiverForCalls(in ComponentName c);
oneway void unregisterMediaButtonEventReceiverForCalls();
int registerRemoteControlClient(in PendingIntent mediaIntent,
in IRemoteControlClient rcClient, in String callingPackageName);
int registerRemoteControlClient(in PendingIntent mediaIntent,
in IRemoteControlClient rcClient, in String callingPackageName);
oneway void unregisterRemoteControlClient(in PendingIntent mediaIntent,
in IRemoteControlClient rcClient);