diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-28 19:52:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 19:52:53 +0000 |
| commit | 3551a59b277fd4dc924f48116c153a50fb0913eb (patch) | |
| tree | b11c52818f7c6489071ce12d2d6f5ac069ba91cf /services/voiceinteraction | |
| parent | 850dd6907f87782474d4bc128c8c0137a9cc85fc (diff) | |
| parent | 57dd737443a174379eb638450e4888500d8e4a23 (diff) | |
| download | frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.zip frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.tar.gz frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.tar.bz2 | |
Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
Diffstat (limited to 'services/voiceinteraction')
| -rw-r--r-- | services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java index a4facc1..28520be 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java @@ -72,7 +72,7 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne public void onReceive(Context context, Intent intent) { if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { String reason = intent.getStringExtra("reason"); - if (!CLOSE_REASON_VOICE_INTERACTION.equals(reason)) { + if (!CLOSE_REASON_VOICE_INTERACTION.equals(reason) && !"dream".equals(reason)) { synchronized (mLock) { if (mActiveSession != null && mActiveSession.mSession != null) { try { |