summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-11-17 18:33:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-17 18:33:21 +0000
commit7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1 (patch)
treedaa811ea89365fef62d18e994f642b97c4a5a6e8
parent3a1c6dacecb328a38ae26c513246eab7a84219f2 (diff)
parent71f6dd7fb41b2bd04b98fe214f2ec5ff88b21d16 (diff)
downloadframeworks_native-7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1.zip
frameworks_native-7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1.tar.gz
frameworks_native-7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1.tar.bz2
Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
-rw-r--r--data/etc/android.software.voice_recognizers.xml2
-rw-r--r--data/etc/handheld_core_hardware.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/etc/android.software.voice_recognizers.xml b/data/etc/android.software.voice_recognizers.xml
index 7e72177..435eed4 100644
--- a/data/etc/android.software.voice_recognizers.xml
+++ b/data/etc/android.software.voice_recognizers.xml
@@ -15,5 +15,5 @@
-->
<permissions>
- <feature name="android.software.voice_recognizers" />
+ <feature name="android.software.voice_recognizers" notLowRam="true" />
</permissions>
diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml
index eaf93fd..50cbe9e 100644
--- a/data/etc/handheld_core_hardware.xml
+++ b/data/etc/handheld_core_hardware.xml
@@ -38,7 +38,7 @@
<!-- basic system services -->
<feature name="android.software.app_widgets" />
<feature name="android.software.connectionservice" />
- <feature name="android.software.voice_recognizers" />
+ <feature name="android.software.voice_recognizers" notLowRam="true" />
<feature name="android.software.backup" />
<feature name="android.software.home_screen" />
<feature name="android.software.input_methods" />