diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-04-25 17:06:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-25 17:06:05 +0000 |
commit | 498b4a0950f8d613b0ba6cb2e393a0fef2bfd6a7 (patch) | |
tree | 06c4b6a4481d07f5d369794fa1eae18168d8a9bb | |
parent | 466954565be8cac018e86e3bddad4e1f4850fa70 (diff) | |
parent | c399ca815102826ab38224dc550b6ea1ec31761b (diff) | |
download | frameworks_native-498b4a0950f8d613b0ba6cb2e393a0fef2bfd6a7.zip frameworks_native-498b4a0950f8d613b0ba6cb2e393a0fef2bfd6a7.tar.gz frameworks_native-498b4a0950f8d613b0ba6cb2e393a0fef2bfd6a7.tar.bz2 |
Merge "Add feature for voice recognition software."
-rw-r--r-- | data/etc/android.software.voice_recognizers.xml | 19 | ||||
-rw-r--r-- | data/etc/handheld_core_hardware.xml | 1 | ||||
-rw-r--r-- | data/etc/tablet_core_hardware.xml | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/data/etc/android.software.voice_recognizers.xml b/data/etc/android.software.voice_recognizers.xml new file mode 100644 index 0000000..7e72177 --- /dev/null +++ b/data/etc/android.software.voice_recognizers.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<permissions> + <feature name="android.software.voice_recognizers" /> +</permissions> diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml index 0bdadef..f0c9e67 100644 --- a/data/etc/handheld_core_hardware.xml +++ b/data/etc/handheld_core_hardware.xml @@ -36,6 +36,7 @@ <!-- basic system services --> <feature name="android.software.app_widgets" /> + <feature name="android.software.voice_recognizers" /> <feature name="android.software.backup" /> <feature name="android.software.home_screen" /> <feature name="android.software.input_methods" /> diff --git a/data/etc/tablet_core_hardware.xml b/data/etc/tablet_core_hardware.xml index 4f7465f..9d217ea 100644 --- a/data/etc/tablet_core_hardware.xml +++ b/data/etc/tablet_core_hardware.xml @@ -37,6 +37,7 @@ <!-- basic system services --> <feature name="android.software.app_widgets" /> + <feature name="android.software.voice_recognizers" /> <feature name="android.software.backup" /> <feature name="android.software.home_screen" /> <feature name="android.software.input_methods" /> |