diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-27 17:48:42 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-07-27 17:49:00 -0700 |
| commit | 1dfa7c6c79a7dfe842c229d7b2efb34608609db1 (patch) | |
| tree | 1f35e901e0fa86c6745f42cd9e79de7fd6cb430d /services/voiceinteraction/java | |
| parent | db71828cb7bff983bd758e986b65731cb0a5b2f6 (diff) | |
| download | frameworks_base-1dfa7c6c79a7dfe842c229d7b2efb34608609db1.zip frameworks_base-1dfa7c6c79a7dfe842c229d7b2efb34608609db1.tar.gz frameworks_base-1dfa7c6c79a7dfe842c229d7b2efb34608609db1.tar.bz2 | |
Don't use screenshot if structure is disabled (1/2)
Bug: 22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3
Diffstat (limited to 'services/voiceinteraction/java')
| -rw-r--r-- | services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java index 47a9fcd..04d6d98 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; |