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

New policy for internal and wired device names.

Browse Source 
For internal and unknowable wired devices, return the product name (i.e. "Nexus 7").
For connected devices with manufacturer-supplied product names, return those.
Change getName() to getProductName().

Bug: 20880296
Change-Id: I67ef3d4c73b3acab368b0879faa26fa9127c21bb
This commit is contained in:
Paul McLean
2015-05-13 15:41:00 -07:00
parent 20eec5bb79
commit 338f27ab28
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -14696,7 +14696,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();

2
api/system-current.txt
View File

@@ -15906,7 +15906,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();

5
media/java/android/media/AudioDeviceInfo.java
View File

@@ -121,8 +121,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;
}
/**

4
services/core/java/com/android/server/WiredAccessoryManager.java
View File

@@ -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;