summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2016-05-09 12:46:23 -0700
committer Amith Yamasani <yamasani@google.com> 2016-05-09 12:46:23 -0700
commit02c80c63d44a6b9d10b18d3b12ee10c0d3e32748 (patch)
tree3b746b1a182c0c60e709f2bc3a7174bc3d0e4d2e
parentde5a7afc7989ecef051635fdc9ae52a69870c026 (diff)
Workaround for assist crash with multiwindow
Temporarily disable multiwindow assist until Bug: 28348867 is fixed correctly. Change-Id: Ia9d0fb5d4412e87aada90e8dcffe829b61221c6c
-rw-r--r--services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java3
1 files changed, 2 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 27351e42d5c5..855a5c47852e 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
@@ -251,7 +251,8 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
&& structureEnabled) {
mAssistData.clear();
final int count = activityToken != null ? 1 : topActivities.size();
- for (int i = 0; i < count; i++) {
+ // Temp workaround for bug: 28348867 Revert after DP3
+ for (int i = 0; i < count && i < 1; i++) {
IBinder topActivity = count == 1 ? activityToken : topActivities.get(i);
try {
MetricsLogger.count(mContext, "assist_with_context", 1);