diff options
| author | Phil Burk <philburk@google.com> | 2015-03-20 00:28:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-20 00:28:30 +0000 |
| commit | 9b58c85524675fd81cd093a8df5273a02f537661 (patch) | |
| tree | 9356597c0b67de9814f4484dea50d951e2f46713 | |
| parent | fca29e7d49c3254c837f0c94f3346b41adf08181 (diff) | |
| parent | 1a7700793db3c7b60d5e090ee026a1bcfeff91d8 (diff) | |
| download | frameworks_base-9b58c85524675fd81cd093a8df5273a02f537661.zip frameworks_base-9b58c85524675fd81cd093a8df5273a02f537661.tar.gz frameworks_base-9b58c85524675fd81cd093a8df5273a02f537661.tar.bz2 | |
Merge "AudioService: fix String cast crash when mediaserver killed"
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 5296ff1..65b2ae2 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -4115,8 +4115,8 @@ public class AudioService extends IAudioService.Stub { AudioSystem.setDeviceConnectionState( spec.mDeviceType, AudioSystem.DEVICE_STATE_AVAILABLE, - (String)device.getValue(), - "unknown-device"); + spec.mDeviceAddress, + spec.mDeviceName); } } // Restore call state |