summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-05-08 21:11:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-08 21:11:08 +0000
commitd7b69c2eca8a43eb069749071a15a635b5dc30d6 (patch)
tree187e4ce79cfe2fc2d9a77329ffbae08c3e321228 /api
parentf93bba5b793a73f98fdaf62ffbccb3ee1769194c (diff)
parentcdcb57791f8392ae37bf80deb33b3d0282260405 (diff)
downloadframeworks_base-d7b69c2eca8a43eb069749071a15a635b5dc30d6.zip
frameworks_base-d7b69c2eca8a43eb069749071a15a635b5dc30d6.tar.gz
frameworks_base-d7b69c2eca8a43eb069749071a15a635b5dc30d6.tar.bz2
Merge "Add feature for pro audio" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index c38c0e7..6e520b8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9341,6 +9341,7 @@ package android.content.pm {
field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets";
field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";
+ field public static final java.lang.String FEATURE_AUDIO_PRO = "android.hardware.audio.pro";
field public static final java.lang.String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive";
field public static final java.lang.String FEATURE_BACKUP = "android.software.backup";
field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
diff --git a/api/system-current.txt b/api/system-current.txt
index 0c57b5a..7445805 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9600,6 +9600,7 @@ package android.content.pm {
field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets";
field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";
+ field public static final java.lang.String FEATURE_AUDIO_PRO = "android.hardware.audio.pro";
field public static final java.lang.String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive";
field public static final java.lang.String FEATURE_BACKUP = "android.software.backup";
field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";