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

am da392904: Set stream volume to max when userMasterVolume is set to true.

Browse Source 
* commit 'da39290460b30e5080769f039d6dff352b3c7808':
  Set stream volume to max when userMasterVolume is set to true.
This commit is contained in:
Wally Yau
2014-12-01 13:13:54 +00:00
committed by Android Git Automerger
parent 7ff0b46995 da39290460
commit 5b4e2e0274
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -608,6 +608,10 @@ public class AudioService extends IAudioService.Stub {
mUseFixedVolume = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_useFixedVolume);
mUseMasterVolume = context.getResources().getBoolean(
com.android.internal.R.bool.config_useMasterVolume);
mMasterVolumeRamp = context.getResources().getIntArray(
com.android.internal.R.array.config_masterVolumeRamp);
// must be called before readPersistedSettings() which needs a valid mStreamVolumeAlias[]
// array initialized by updateStreamVolumeAlias()
@@ -658,13 +662,8 @@ public class AudioService extends IAudioService.Stub {
context.registerReceiver(mReceiver, intentFilter);
mUseMasterVolume = context.getResources().getBoolean(
com.android.internal.R.bool.config_useMasterVolume);
restoreMasterVolume();
mMasterVolumeRamp = context.getResources().getIntArray(
com.android.internal.R.array.config_masterVolumeRamp);
LocalServices.addService(AudioManagerInternal.class, new AudioServiceInternal());
}
@@ -3446,8 +3445,9 @@ public class AudioService extends IAudioService.Stub {
public void readSettings() {
synchronized (VolumeStreamState.class) {
// force maximum volume on all streams if fixed volume property is set
if (mUseFixedVolume) {
// force maximum volume on all streams if fixed volume property
// or master volume property is set
if (mUseFixedVolume || mUseMasterVolume) {
mIndex.put(AudioSystem.DEVICE_OUT_DEFAULT, mIndexMax);
return;
}
@@ -3672,7 +3672,7 @@ public class AudioService extends IAudioService.Stub {
private int getValidIndex(int index) {
if (index < 0) {
return 0;
} else if (mUseFixedVolume || index > mIndexMax) {
} else if (mUseFixedVolume || mUseMasterVolume || index > mIndexMax) {
return mIndexMax;
}