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

am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0

Browse Source 
* commit '615858a8ebb12b3541fd709e6e965ac814880261':
  Indicate screen off condition to audio framework.
This commit is contained in:
Eric Laurent
2011-10-14 12:58:40 -07:00
committed by Android Git Automerger
parent 93c299d0d0 615858a8eb
commit e04783ccde
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,6 +368,8 @@ public class AudioService extends IAudioService.Stub {
intentFilter.addAction(Intent.ACTION_USB_DGTL_HEADSET_PLUG);
intentFilter.addAction(Intent.ACTION_HDMI_AUDIO_PLUG);
intentFilter.addAction(Intent.ACTION_BOOT_COMPLETED);
intentFilter.addAction(Intent.ACTION_SCREEN_ON);
intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
context.registerReceiver(mReceiver, intentFilter);
// Register for package removal intent broadcasts for media button receiver persistence
@@ -2565,6 +2567,10 @@ public class AudioService extends IAudioService.Stub {
removeMediaButtonReceiverForPackage(packageName);
}
}
} else if (action.equals(Intent.ACTION_SCREEN_ON)) {
AudioSystem.setParameters("screen_state=on");
} else if (action.equals(Intent.ACTION_SCREEN_OFF)) {
AudioSystem.setParameters("screen_state=off");
}
}
}