am c2980b0: am 8c362b0: am 843c539: Merge "AudioService: fix settings for fixed volume device" into jb-mr1-dev

* commit 'c2980b0355ffdeeab9a0aacdc2e24c20961d883e':
  AudioService: fix settings for fixed volume device

Author: Eric Laurent

media/java/android/media/AudioService.java

@@ -1750,16 +1750,17 @@ private void readAudioSettings(boolean userSwitch) {
             }
         }
 
+        // apply new ringer mode before checking volume for alias streams so that streams
+        // muted by ringer mode have the correct volume
+        setRingerModeInt(getRingerMode(), false);
+
         checkAllAliasStreamVolumes();
 
         synchronized (mSafeMediaVolumeState) {
             if (mSafeMediaVolumeState == SAFE_MEDIA_VOLUME_ACTIVE) {
                 enforceSafeMediaVolume();
             }
         }
-
-        // apply new ringer mode
-        setRingerModeInt(getRingerMode(), false);
     }
 
     /** @see AudioManager#setSpeakerphoneOn() */
@@ -2575,9 +2576,10 @@ private VolumeStreamState(String settingName, int streamType) {
             AudioSystem.initStreamVolume(streamType, 0, mIndexMax);
             mIndexMax *= 10;
 
-            readSettings();
-
+            // mDeathHandlers must be created before calling readSettings()
             mDeathHandlers = new ArrayList<VolumeDeathHandler>();
+
+            readSettings();
         }
 
         public String getSettingNameForDevice(boolean lastAudible, int device) {
@@ -2597,7 +2599,9 @@ public synchronized void readSettings() {
             // do not read system stream volume from settings: this stream is always aliased
             // to another stream type and its volume is never persisted. Values in settings can
             // only be stale values
-            if ((mStreamType == AudioSystem.STREAM_SYSTEM) ||
+            // on first call to readSettings() at init time, muteCount() is always 0 so we will
+            // always create entries for default device
+            if ((muteCount() == 0) && (mStreamType == AudioSystem.STREAM_SYSTEM) ||
                     (mStreamType == AudioSystem.STREAM_SYSTEM_ENFORCED)) {
                 mLastAudibleIndex.put(AudioSystem.DEVICE_OUT_DEFAULT,
                                           10 * AudioManager.DEFAULT_STREAM_VOLUME[mStreamType]);
@@ -2613,6 +2617,14 @@ public synchronized void readSettings() {
                 }
                 remainingDevices &= ~device;
 
+                // ignore settings for fixed volume devices: volume should always be at max
+                if ((muteCount() == 0) &&
+                        (mStreamVolumeAlias[mStreamType] == AudioSystem.STREAM_MUSIC) &&
+                        ((device & mFixedVolumeDevices) != 0)) {
+                    mIndex.put(device, mIndexMax);
+                    mLastAudibleIndex.put(device, mIndexMax);
+                    continue;
+                }
                 // retrieve current volume for device
                 String name = getSettingNameForDevice(false /* lastAudible */, device);
                 // if no volume stored for current stream and device, use default volume if default
@@ -2798,7 +2810,12 @@ public synchronized void setAllIndexes(VolumeStreamState srcStream, boolean last
                 int device = ((Integer)entry.getKey()).intValue();
                 int index = ((Integer)entry.getValue()).intValue();
                 index = rescaleIndex(index, srcStream.getStreamType(), mStreamType);
-                setIndex(index, device, lastAudible);
+
+                if (lastAudible) {
+                    setLastAudibleIndex(index, device);
+                } else {
+                    setIndex(index, device, false /* lastAudible */);
+                }
             }
         }