diff options
| author | Paul McLean <pmclean@google.com> | 2015-05-13 15:41:00 -0700 |
|---|---|---|
| committer | Paul McLean <pmclean@google.com> | 2015-05-13 15:41:00 -0700 |
| commit | 338f27ab28a451d08417e4b2987aba1267b4c95d (patch) | |
| tree | ddd886b6bc2ad8b6e3fa26b70431ed89dfba245f /api | |
| parent | 20eec5bb794d0e1333ab3dca370f8b2ad2498416 (diff) | |
| download | frameworks_base-338f27ab28a451d08417e4b2987aba1267b4c95d.zip frameworks_base-338f27ab28a451d08417e4b2987aba1267b4c95d.tar.gz frameworks_base-338f27ab28a451d08417e4b2987aba1267b4c95d.tar.bz2 | |
New policy for internal and wired device names.
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
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 08d6a9d..47dfa2f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/api/system-current.txt b/api/system-current.txt index 7cf49e8..f490d68 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(); |