diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-28 19:49:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 19:49:44 +0000 |
| commit | 850dd6907f87782474d4bc128c8c0137a9cc85fc (patch) | |
| tree | 819d3238c6d992aabc2f7f554ec28b6849acf302 | |
| parent | b3c93c5f4256a1da1a8020abe5812a841b67667a (diff) | |
| parent | 1dfa7c6c79a7dfe842c229d7b2efb34608609db1 (diff) | |
| download | frameworks_base-850dd6907f87782474d4bc128c8c0137a9cc85fc.zip frameworks_base-850dd6907f87782474d4bc128c8c0137a9cc85fc.tar.gz frameworks_base-850dd6907f87782474d4bc128c8c0137a9cc85fc.tar.bz2 | |
Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev
| -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; |