diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-08-13 06:07:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
| commit | 3eb780bc17d6f655e389c44a83c4659c454dd24d (patch) | |
| tree | 04858d54fdd06856dbdc662f9611033d309e0a36 | |
| parent | dd8e48f306b85ab10d57e474475f3ab9756aa5e9 (diff) | |
| parent | ecc7498b2bcf65adf20f5544a2994c68b75f8cea (diff) | |
| download | frameworks_base-3eb780bc17d6f655e389c44a83c4659c454dd24d.zip frameworks_base-3eb780bc17d6f655e389c44a83c4659c454dd24d.tar.gz frameworks_base-3eb780bc17d6f655e389c44a83c4659c454dd24d.tar.bz2 | |
Merge "Turn off voice interaction service restrction for now" into lmp-dev
| -rw-r--r-- | core/java/android/service/voice/VoiceInteractionServiceInfo.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java index 0d2f863..e6e9413 100644 --- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java +++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java @@ -99,10 +99,11 @@ public class VoiceInteractionServiceInfo { mParseError = "No sessionService specified"; return; } + /* Not yet time 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); |