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

Merge "Always queue A2DP connection state message with wakelock held" into jb-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2012-06-06 13:31:53 -07:00
committed by Android (Google) Code Review
parent 622976ba77 e12c39bb9c
commit 88a89b2911
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,10 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
private static final int MSG_RCDISPLAY_UPDATE = 13; private static final int MSG_RCDISPLAY_UPDATE = 13;
private static final int MSG_SET_ALL_VOLUMES = 14; private static final int MSG_SET_ALL_VOLUMES = 14;
private static final int MSG_PERSIST_MASTER_VOLUME_MUTE = 15; private static final int MSG_PERSIST_MASTER_VOLUME_MUTE = 15;
private static final int MSG_SET_WIRED_DEVICE_CONNECTION_STATE = 16;//handled under wakelock // messages handled under wakelock, can only be queued, i.e. sent with queueMsgUnderWakeLock(),
private static final int MSG_SET_A2DP_CONNECTION_STATE = 17; //handled under wakelock // and not with sendMsg(..., ..., SENDMSG_QUEUE, ...)
private static final int MSG_SET_WIRED_DEVICE_CONNECTION_STATE = 16;
private static final int MSG_SET_A2DP_CONNECTION_STATE = 17;
// flags for MSG_PERSIST_VOLUME indicating if current and/or last audible volume should be // flags for MSG_PERSIST_VOLUME indicating if current and/or last audible volume should be
@@ -1962,9 +1964,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
int delay = checkSendBecomingNoisyIntent( int delay = checkSendBecomingNoisyIntent(
AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,
(state == BluetoothA2dp.STATE_CONNECTED) ? 1 : 0); (state == BluetoothA2dp.STATE_CONNECTED) ? 1 : 0);
sendMsg(mAudioHandler, queueMsgUnderWakeLock(mAudioHandler,
MSG_SET_A2DP_CONNECTION_STATE, MSG_SET_A2DP_CONNECTION_STATE,
SENDMSG_QUEUE,
state, state,
0, 0,
btDevice, btDevice,