summaryrefslogtreecommitdiffstats
path: root/data/etc
diff options
context:
space:
mode:
authorDan Morrill <morrildl@google.com>2010-09-27 10:39:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 10:39:19 -0700
commitc6581a1046b062d0e06e50e9b09e6c12a8e54efc (patch)
treeacfa70d2c09bf45d1512cceb7b701be9b00769d3 /data/etc
parenta9f17c8b424b505b50fdfb920cab37c32cbe628d (diff)
parent4e9751f0770c8bfe6f7d57465cba754af5aa942b (diff)
downloadframeworks_base-c6581a1046b062d0e06e50e9b09e6c12a8e54efc.zip
frameworks_base-c6581a1046b062d0e06e50e9b09e6c12a8e54efc.tar.gz
frameworks_base-c6581a1046b062d0e06e50e9b09e6c12a8e54efc.tar.bz2
am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d
Merge commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp * commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b': Adding a feature to indicate that the device possesses low-latency audio.
Diffstat (limited to 'data/etc')
-rw-r--r--data/etc/android.hardware.audio.low_latency.xml22
-rw-r--r--data/etc/handheld_core_hardware.xml3
2 files changed, 25 insertions, 0 deletions
diff --git a/data/etc/android.hardware.audio.low_latency.xml b/data/etc/android.hardware.audio.low_latency.xml
new file mode 100644
index 0000000..677ec1c
--- /dev/null
+++ b/data/etc/android.hardware.audio.low_latency.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the feature indicating low-latency audio, as specified by the
+ CDD. ONLY devices that meet the CDD's requirements may declare this
+ feature. -->
+<permissions>
+ <feature name="android.hardware.audio.low_latency" />
+</permissions>
diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml
index a3c9f6d..7f87b79 100644
--- a/data/etc/handheld_core_hardware.xml
+++ b/data/etc/handheld_core_hardware.xml
@@ -57,4 +57,7 @@
android.hardware.sensor.proximity.xml -->
<!-- GSM phones must also include android.hardware.telephony.gsm.xml -->
<!-- CDMA phones must also include android.hardware.telephony.cdma.xml -->
+ <!-- Devices that have low-latency audio stacks suitable for apps like
+ VoIP may include android.hardware.audio.low_latency.xml. ONLY apps
+ that meet the requirements specified in the CDD may include this. -->
</permissions>