Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev

Author: XSJoJo

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java

@@ -214,7 +214,7 @@ public boolean showLocked(Bundle args, int flags, int disabledContext,
             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;