diff options
| author | Paul Mclean <pmclean@google.com> | 2015-03-19 22:02:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-19 22:02:42 +0000 |
| commit | 3756b40992b4940101eb84604b9283167bee9a34 (patch) | |
| tree | f181d26227fa1f6580908497399c0560dd989e01 | |
| parent | c6dbfececd23a720dcda64395cb8d0e92662ab03 (diff) | |
| parent | 413d307c2c646bb2aa563f8167bfa78f0b59a654 (diff) | |
| download | frameworks_base-3756b40992b4940101eb84604b9283167bee9a34.zip frameworks_base-3756b40992b4940101eb84604b9283167bee9a34.tar.gz frameworks_base-3756b40992b4940101eb84604b9283167bee9a34.tar.bz2 | |
Merge "AudioService: fix crash when mediaserver killed"
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 83ecf91..5296ff1 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -4111,8 +4111,9 @@ public class AudioService extends IAudioService.Stub { Iterator i = set.iterator(); while (i.hasNext()) { Map.Entry device = (Map.Entry)i.next(); + DeviceListSpec spec = (DeviceListSpec)device.getValue(); AudioSystem.setDeviceConnectionState( - ((Integer)device.getKey()).intValue(), + spec.mDeviceType, AudioSystem.DEVICE_STATE_AVAILABLE, (String)device.getValue(), "unknown-device"); |