diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioDeviceInfo.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/WiredAccessoryManager.java | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 7adaa41eebb1..3046aaf0bf9c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14704,7 +14704,7 @@ package android.media { method public int[] getChannelMasks(); method public int[] getFormats(); method public int getId(); - method public java.lang.CharSequence getName(); + method public java.lang.CharSequence getProductName(); method public int[] getSampleRates(); method public int getType(); method public boolean isSink(); diff --git a/api/system-current.txt b/api/system-current.txt index 4b76109fce6d..d3a16a682f27 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -15917,7 +15917,7 @@ package android.media { method public int[] getChannelMasks(); method public int[] getFormats(); method public int getId(); - method public java.lang.CharSequence getName(); + method public java.lang.CharSequence getProductName(); method public int[] getSampleRates(); method public int getType(); method public boolean isSink(); diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java index 4ecb930eeec8..0384d40651ca 100644 --- a/media/java/android/media/AudioDeviceInfo.java +++ b/media/java/android/media/AudioDeviceInfo.java @@ -122,8 +122,9 @@ public final class AudioDeviceInfo { /** * @return The human-readable name of the audio device. */ - public CharSequence getName() { - return mPort.name(); + public CharSequence getProductName() { + String portName = mPort.name(); + return portName.length() != 0 ? portName : android.os.Build.MODEL; } /** diff --git a/services/core/java/com/android/server/WiredAccessoryManager.java b/services/core/java/com/android/server/WiredAccessoryManager.java index 0de8c8dd9df5..e0e6070a811a 100644 --- a/services/core/java/com/android/server/WiredAccessoryManager.java +++ b/services/core/java/com/android/server/WiredAccessoryManager.java @@ -216,9 +216,9 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks { mWakeLock.acquire(); - Log.i(TAG, "MSG_NEW_DEVICE_STATE "); + Log.i(TAG, "MSG_NEW_DEVICE_STATE"); Message msg = mHandler.obtainMessage(MSG_NEW_DEVICE_STATE, headsetState, - mHeadsetState, newName); + mHeadsetState, ""); mHandler.sendMessage(msg); mHeadsetState = headsetState; |