From 1dfa7c6c79a7dfe842c229d7b2efb34608609db1 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 27 Jul 2015 17:48:42 -0700
Subject: [PATCH] Don't use screenshot if structure is disabled (1/2)

Bug: 22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3
---
 .../voiceinteraction/VoiceInteractionSessionConnection.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
index 47a9fcd90ed67..04d6d98fe2b20 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
@@ -214,7 +214,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
             disabledContext |= getUserDisabledShowContextLocked();
             boolean structureEnabled = isAssistDataAllowed
                     && (disabledContext&VoiceInteractionSession.SHOW_WITH_ASSIST) == 0;
-            boolean screenshotEnabled = isAssistDataAllowed
+            boolean screenshotEnabled = isAssistDataAllowed && structureEnabled
                     && (disabledContext&VoiceInteractionSession.SHOW_WITH_SCREENSHOT) == 0;
             mShowArgs = args;
             mShowFlags = flags;