Merge "Do not broadcast ACTION_AUDIO_BECOMING_NOISY on first boot."
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 4c1db72..95cbf10 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -477,6 +477,8 @@
// true if boot sequence has been completed
private boolean mSystemReady;
+ // true if Intent.ACTION_USER_SWITCHED has ever been received
+ private boolean mUserSwitchedReceived;
// listener for SoundPool sample load completion indication
private SoundPoolCallback mSoundPoolCallBack;
// thread for SoundPool listener
@@ -5059,14 +5061,18 @@
} else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {
handleConfigurationChanged(context);
} else if (action.equals(Intent.ACTION_USER_SWITCHED)) {
- // attempt to stop music playback for background user
- sendMsg(mAudioHandler,
- MSG_BROADCAST_AUDIO_BECOMING_NOISY,
- SENDMSG_REPLACE,
- 0,
- 0,
- null,
- 0);
+ if (mUserSwitchedReceived) {
+ // attempt to stop music playback for background user except on first user
+ // switch (i.e. first boot)
+ sendMsg(mAudioHandler,
+ MSG_BROADCAST_AUDIO_BECOMING_NOISY,
+ SENDMSG_REPLACE,
+ 0,
+ 0,
+ null,
+ 0);
+ }
+ mUserSwitchedReceived = true;
// the current audio focus owner is no longer valid
mMediaFocusControl.discardAudioFocusOwner();