Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jorim Jaggi
2015-07-28 19:49:44 +00:00
committed by Android (Google) Code Review
parent b3c93c5f42 1dfa7c6c79
commit 850dd6907f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
View File

@@ -214,7 +214,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
disabledContext |= getUserDisabledShowContextLocked(); disabledContext |= getUserDisabledShowContextLocked();
boolean structureEnabled = isAssistDataAllowed boolean structureEnabled = isAssistDataAllowed
&& (disabledContext&VoiceInteractionSession.SHOW_WITH_ASSIST) == 0; && (disabledContext&VoiceInteractionSession.SHOW_WITH_ASSIST) == 0;
boolean screenshotEnabled = isAssistDataAllowed boolean screenshotEnabled = isAssistDataAllowed && structureEnabled
&& (disabledContext&VoiceInteractionSession.SHOW_WITH_SCREENSHOT) == 0; && (disabledContext&VoiceInteractionSession.SHOW_WITH_SCREENSHOT) == 0;
mShowArgs = args; mShowArgs = args;
mShowFlags = flags; mShowFlags = flags;