@@ -480,6 +480,7 @@ public AudioService(Context context) {
480480 intentFilter .addAction (Intent .ACTION_BOOT_COMPLETED );
481481 intentFilter .addAction (Intent .ACTION_SCREEN_ON );
482482 intentFilter .addAction (Intent .ACTION_SCREEN_OFF );
483+ intentFilter .addAction (Intent .ACTION_USER_SWITCHED );
483484
484485 // Register a configuration change listener only if requested by system properties
485486 // to monitor orientation changes (off by default)
@@ -608,7 +609,7 @@ private void readPersistedSettings() {
608609 final ContentResolver cr = mContentResolver ;
609610
610611 int ringerModeFromSettings =
611- System .getInt (cr , System .MODE_RINGER , AudioManager .RINGER_MODE_NORMAL );
612+ Settings . Global .getInt (cr , System .MODE_RINGER , AudioManager .RINGER_MODE_NORMAL );
612613 int ringerMode = ringerModeFromSettings ;
613614 // sanity check in case the settings are restored from a device with incompatible
614615 // ringer modes
@@ -619,7 +620,7 @@ private void readPersistedSettings() {
619620 ringerMode = AudioManager .RINGER_MODE_SILENT ;
620621 }
621622 if (ringerMode != ringerModeFromSettings ) {
622- System .putInt (cr , System .MODE_RINGER , ringerMode );
623+ Settings . Global .putInt (cr , System .MODE_RINGER , ringerMode );
623624 }
624625 synchronized (mSettingsLock ) {
625626 mRingerMode = ringerMode ;
@@ -638,23 +639,30 @@ private void readPersistedSettings() {
638639
639640 // make sure settings for ringer mode are consistent with device type: non voice capable
640641 // devices (tablets) include media stream in silent mode whereas phones don't.
641- mRingerModeAffectedStreams = Settings .System .getInt (cr ,
642+ mRingerModeAffectedStreams = Settings .System .getIntForUser (cr ,
642643 Settings .System .MODE_RINGER_STREAMS_AFFECTED ,
643644 ((1 << AudioSystem .STREAM_RING )|(1 << AudioSystem .STREAM_NOTIFICATION )|
644- (1 << AudioSystem .STREAM_SYSTEM )|(1 << AudioSystem .STREAM_SYSTEM_ENFORCED )));
645+ (1 << AudioSystem .STREAM_SYSTEM )|(1 << AudioSystem .STREAM_SYSTEM_ENFORCED )),
646+ UserHandle .USER_CURRENT );
645647 if (mVoiceCapable ) {
646648 mRingerModeAffectedStreams &= ~(1 << AudioSystem .STREAM_MUSIC );
647649 } else {
648650 mRingerModeAffectedStreams |= (1 << AudioSystem .STREAM_MUSIC );
649651 }
650- Settings .System .putInt (cr ,
651- Settings .System .MODE_RINGER_STREAMS_AFFECTED , mRingerModeAffectedStreams );
652+ Settings .System .putIntForUser (cr ,
653+ Settings .System .MODE_RINGER_STREAMS_AFFECTED ,
654+ mRingerModeAffectedStreams ,
655+ UserHandle .USER_CURRENT );
652656
653- mMuteAffectedStreams = System .getInt (cr ,
657+ mMuteAffectedStreams = System .getIntForUser (cr ,
654658 System .MUTE_STREAMS_AFFECTED ,
655- ((1 << AudioSystem .STREAM_MUSIC )|(1 << AudioSystem .STREAM_RING )|(1 << AudioSystem .STREAM_SYSTEM )));
659+ ((1 << AudioSystem .STREAM_MUSIC )|
660+ (1 << AudioSystem .STREAM_RING )|
661+ (1 << AudioSystem .STREAM_SYSTEM )),
662+ UserHandle .USER_CURRENT );
656663
657- boolean masterMute = System .getInt (cr , System .VOLUME_MASTER_MUTE , 0 ) == 1 ;
664+ boolean masterMute = System .getIntForUser (cr , System .VOLUME_MASTER_MUTE ,
665+ 0 , UserHandle .USER_CURRENT ) == 1 ;
658666 AudioSystem .setMasterMute (masterMute );
659667 broadcastMasterMuteStatus (masterMute );
660668
@@ -1237,8 +1245,8 @@ private void setRingerModeInt(int ringerMode, boolean persist) {
12371245
12381246 private void restoreMasterVolume () {
12391247 if (mUseMasterVolume ) {
1240- float volume = Settings .System .getFloat (mContentResolver ,
1241- Settings .System .VOLUME_MASTER , -1.0f );
1248+ float volume = Settings .System .getFloatForUser (mContentResolver ,
1249+ Settings .System .VOLUME_MASTER , -1.0f , UserHandle . USER_CURRENT );
12421250 if (volume >= 0.0f ) {
12431251 AudioSystem .setMasterVolume (volume );
12441252 }
@@ -1674,6 +1682,10 @@ public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
16741682
16751683 /** @see AudioManager#reloadAudioSettings() */
16761684 public void reloadAudioSettings () {
1685+ readAudioSettings (false /*userSwitch*/ );
1686+ }
1687+
1688+ private void readAudioSettings (boolean userSwitch ) {
16771689 // restore ringer mode, ringer mode affected streams, mute affected streams and vibrate settings
16781690 readPersistedSettings ();
16791691
@@ -1682,6 +1694,10 @@ public void reloadAudioSettings() {
16821694 for (int streamType = 0 ; streamType < numStreamTypes ; streamType ++) {
16831695 VolumeStreamState streamState = mStreamStates [streamType ];
16841696
1697+ if (userSwitch && mStreamVolumeAlias [streamType ] == AudioSystem .STREAM_MUSIC ) {
1698+ continue ;
1699+ }
1700+
16851701 synchronized (streamState ) {
16861702 streamState .readSettings ();
16871703
@@ -2536,7 +2552,8 @@ public synchronized void readSettings() {
25362552 // device, continue otherwise
25372553 int defaultIndex = (device == AudioSystem .DEVICE_OUT_DEFAULT ) ?
25382554 AudioManager .DEFAULT_STREAM_VOLUME [mStreamType ] : -1 ;
2539- int index = Settings .System .getInt (mContentResolver , name , defaultIndex );
2555+ int index = Settings .System .getIntForUser (
2556+ mContentResolver , name , defaultIndex , UserHandle .USER_CURRENT );
25402557 if (index == -1 ) {
25412558 continue ;
25422559 }
@@ -2547,7 +2564,8 @@ public synchronized void readSettings() {
25472564 // or default index
25482565 defaultIndex = (index > 0 ) ?
25492566 index : AudioManager .DEFAULT_STREAM_VOLUME [mStreamType ];
2550- int lastAudibleIndex = Settings .System .getInt (mContentResolver , name , defaultIndex );
2567+ int lastAudibleIndex = Settings .System .getIntForUser (
2568+ mContentResolver , name , defaultIndex , UserHandle .USER_CURRENT );
25512569
25522570 // a last audible index of 0 should never be stored for ring and notification
25532571 // streams on phones (voice capable devices).
@@ -2959,19 +2977,21 @@ private void persistVolume(VolumeStreamState streamState,
29592977 int persistType ,
29602978 int device ) {
29612979 if ((persistType & PERSIST_CURRENT ) != 0 ) {
2962- System .putInt (mContentResolver ,
2980+ System .putIntForUser (mContentResolver ,
29632981 streamState .getSettingNameForDevice (false /* lastAudible */ , device ),
2964- (streamState .getIndex (device , false /* lastAudible */ ) + 5 )/ 10 );
2982+ (streamState .getIndex (device , false /* lastAudible */ ) + 5 )/ 10 ,
2983+ UserHandle .USER_CURRENT );
29652984 }
29662985 if ((persistType & PERSIST_LAST_AUDIBLE ) != 0 ) {
2967- System .putInt (mContentResolver ,
2986+ System .putIntForUser (mContentResolver ,
29682987 streamState .getSettingNameForDevice (true /* lastAudible */ , device ),
2969- (streamState .getIndex (device , true /* lastAudible */ ) + 5 ) / 10 );
2988+ (streamState .getIndex (device , true /* lastAudible */ ) + 5 ) / 10 ,
2989+ UserHandle .USER_CURRENT );
29702990 }
29712991 }
29722992
29732993 private void persistRingerMode (int ringerMode ) {
2974- System .putInt (mContentResolver , System .MODE_RINGER , ringerMode );
2994+ Settings . Global .putInt (mContentResolver , System .MODE_RINGER , ringerMode );
29752995 }
29762996
29772997 private void playSoundEffect (int effectType , int volume ) {
@@ -3021,8 +3041,10 @@ public boolean onError(MediaPlayer mp, int what, int extra) {
30213041 }
30223042
30233043 private void onHandlePersistMediaButtonReceiver (ComponentName receiver ) {
3024- Settings .System .putString (mContentResolver , Settings .System .MEDIA_BUTTON_RECEIVER ,
3025- receiver == null ? "" : receiver .flattenToString ());
3044+ Settings .System .putStringForUser (mContentResolver ,
3045+ Settings .System .MEDIA_BUTTON_RECEIVER ,
3046+ receiver == null ? "" : receiver .flattenToString (),
3047+ UserHandle .USER_CURRENT );
30263048 }
30273049
30283050 private void cleanupPlayer (MediaPlayer mp ) {
@@ -3058,13 +3080,17 @@ public void handleMessage(Message msg) {
30583080 break ;
30593081
30603082 case MSG_PERSIST_MASTER_VOLUME :
3061- Settings .System .putFloat (mContentResolver , Settings .System .VOLUME_MASTER ,
3062- (float )msg .arg1 / (float )1000.0 );
3083+ Settings .System .putFloatForUser (mContentResolver ,
3084+ Settings .System .VOLUME_MASTER ,
3085+ (float )msg .arg1 / (float )1000.0 ,
3086+ UserHandle .USER_CURRENT );
30633087 break ;
30643088
30653089 case MSG_PERSIST_MASTER_VOLUME_MUTE :
3066- Settings .System .putInt (mContentResolver , Settings .System .VOLUME_MASTER_MUTE ,
3067- msg .arg1 );
3090+ Settings .System .putIntForUser (mContentResolver ,
3091+ Settings .System .VOLUME_MASTER_MUTE ,
3092+ msg .arg1 ,
3093+ UserHandle .USER_CURRENT );
30683094 break ;
30693095
30703096 case MSG_PERSIST_RINGER_MODE :
@@ -3248,10 +3274,11 @@ public void onChange(boolean selfChange) {
32483274 // and mRingerModeAffectedStreams, so will leave this synchronized for now.
32493275 // mRingerModeMutedStreams and mMuteAffectedStreams are safe (only accessed once).
32503276 synchronized (mSettingsLock ) {
3251- int ringerModeAffectedStreams = Settings .System .getInt (mContentResolver ,
3277+ int ringerModeAffectedStreams = Settings .System .getIntForUser (mContentResolver ,
32523278 Settings .System .MODE_RINGER_STREAMS_AFFECTED ,
32533279 ((1 << AudioSystem .STREAM_RING )|(1 << AudioSystem .STREAM_NOTIFICATION )|
3254- (1 << AudioSystem .STREAM_SYSTEM )|(1 << AudioSystem .STREAM_SYSTEM_ENFORCED )));
3280+ (1 << AudioSystem .STREAM_SYSTEM )|(1 << AudioSystem .STREAM_SYSTEM_ENFORCED )),
3281+ UserHandle .USER_CURRENT );
32553282 if (mVoiceCapable ) {
32563283 ringerModeAffectedStreams &= ~(1 << AudioSystem .STREAM_MUSIC );
32573284 } else {
@@ -3673,6 +3700,15 @@ public void onReceive(Context context, Intent intent) {
36733700 AudioSystem .setParameters ("screen_state=off" );
36743701 } else if (action .equalsIgnoreCase (Intent .ACTION_CONFIGURATION_CHANGED )) {
36753702 handleConfigurationChanged (context );
3703+ } else if (action .equals (Intent .ACTION_USER_SWITCHED )) {
3704+ readAudioSettings (true /*userSwitch*/ );
3705+ // preserve STREAM_MUSIC volume from one user to the next.
3706+ sendMsg (mAudioHandler ,
3707+ MSG_SET_ALL_VOLUMES ,
3708+ SENDMSG_QUEUE ,
3709+ 0 ,
3710+ 0 ,
3711+ mStreamStates [AudioSystem .STREAM_MUSIC ], 0 );
36763712 }
36773713 }
36783714 }
@@ -4547,8 +4583,8 @@ private void removeMediaButtonReceiverForPackage(String packageName) {
45474583 * Restore remote control receiver from the system settings.
45484584 */
45494585 private void restoreMediaButtonReceiver () {
4550- String receiverName = Settings .System .getString (mContentResolver ,
4551- Settings .System .MEDIA_BUTTON_RECEIVER );
4586+ String receiverName = Settings .System .getStringForUser (mContentResolver ,
4587+ Settings .System .MEDIA_BUTTON_RECEIVER , UserHandle . USER_CURRENT );
45524588 if ((null != receiverName ) && !receiverName .isEmpty ()) {
45534589 ComponentName eventReceiver = ComponentName .unflattenFromString (receiverName );
45544590 // construct a PendingIntent targeted to the restored component name
0 commit comments