Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb80a86d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 359f1e91: am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev 

* commit '359f1e91':
  Don't use screenshot if structure is disabled (1/2)
parents 872d264c 359f1e91

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

+1 −1
Original line number Diff line number Diff line
@@ -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;