diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-08-12 15:06:50 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2014-08-12 15:38:19 -0700 |
commit | a3fb40d5f492825bb86769f541620baca5616e05 (patch) | |
tree | b0ee1bfed076637ffd16ef5b3087c961ba0fb3a2 /core/java/android/service | |
parent | e25547b335bf44568cf8eed2294f43d7853049d2 (diff) | |
download | frameworks_base-a3fb40d5f492825bb86769f541620baca5616e05.zip frameworks_base-a3fb40d5f492825bb86769f541620baca5616e05.tar.gz frameworks_base-a3fb40d5f492825bb86769f541620baca5616e05.tar.bz2 |
Add 560dpi, and some other stuff.
Like new settings actions for some of the new settings panels.
And fix voice interaction services so they require a recognizer.
And tweak array map doc to be correct.
Blah blah blah.
Change-Id: Ib5e66b574b10e7b3fa39723b21046a74e6ead204
Diffstat (limited to 'core/java/android/service')
-rw-r--r-- | core/java/android/service/voice/VoiceInteractionServiceInfo.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java index bacda04..0d2f863 100644 --- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java +++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java @@ -99,6 +99,10 @@ public class VoiceInteractionServiceInfo { mParseError = "No sessionService specified"; return; } + if (mRecognitionService == null) { + mParseError = "No recogitionService specified"; + return; + } } catch (XmlPullParserException e) { mParseError = "Error parsing voice interation service meta-data: " + e; Log.w(TAG, "error parsing voice interaction service meta-data", e); |