Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9ea996a3: Do not restore the media button event receiver

Browse Source 
* commit '9ea996a330a21af89f308bdf52e02a470643013b':
  Do not restore the media button event receiver
This commit is contained in:
Jean-Michel Trivi
2014-08-29 16:41:10 +00:00
committed by Android Git Automerger
parent 3a544a81b3 9ea996a330
commit 2cb287f9cc
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media/java/android/media/AudioService.java
View File

@@ -756,9 +756,6 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
// Broadcast vibrate settings // Broadcast vibrate settings
broadcastVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER); broadcastVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER);
broadcastVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION); broadcastVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION);
// Restore the default media button receiver from the system settings
restoreMediaButtonReceiver();
} }
private int rescaleIndex(int index, int srcStream, int dstStream) { private int rescaleIndex(int index, int srcStream, int dstStream) {
@@ -4882,26 +4879,6 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
} }
} }
/**
* Helper function:
* Restore remote control receiver from the system settings.
*/
private void restoreMediaButtonReceiver() {
String receiverName = Settings.System.getStringForUser(mContentResolver,
Settings.System.MEDIA_BUTTON_RECEIVER, UserHandle.USER_CURRENT);
if ((null != receiverName) && !receiverName.isEmpty()) {
ComponentName eventReceiver = ComponentName.unflattenFromString(receiverName);
// construct a PendingIntent targeted to the restored component name
// for the media button and register it
Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
// the associated intent will be handled by the component being registered
mediaButtonIntent.setComponent(eventReceiver);
PendingIntent pi = PendingIntent.getBroadcast(mContext,
0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/);
registerMediaButtonIntent(pi, eventReceiver);
}
}
/** /**
* Helper function: * Helper function:
* Set the new remote control receiver at the top of the RC focus stack. * Set the new remote control receiver at the top of the RC focus stack.