summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorPaul McLean <pmclean@google.com>2015-05-14 15:59:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 15:59:38 +0000
commitf799491fb4781c890625cfd0d2b397abbfb169e3 (patch)
treef0fd8bf23eae8bd91889ff5974847ca68e066d11 /api/system-current.txt
parentfc56b88ac4ea56c53f9ab648b6a92d85a05562c8 (diff)
parent338f27ab28a451d08417e4b2987aba1267b4c95d (diff)
downloadframeworks_base-f799491fb4781c890625cfd0d2b397abbfb169e3.zip
frameworks_base-f799491fb4781c890625cfd0d2b397abbfb169e3.tar.gz
frameworks_base-f799491fb4781c890625cfd0d2b397abbfb169e3.tar.bz2
Merge "New policy for internal and wired device names." into mnc-dev
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 4b76109..d3a16a6 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();