From 02c80c63d44a6b9d10b18d3b12ee10c0d3e32748 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 9 May 2016 12:46:23 -0700
Subject: [PATCH] Workaround for assist crash with multiwindow

Temporarily disable multiwindow assist until
Bug: 28348867
is fixed correctly.

Change-Id: Ia9d0fb5d4412e87aada90e8dcffe829b61221c6c
---
 .../voiceinteraction/VoiceInteractionSessionConnection.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
index 27351e42d5c52..855a5c47852e3 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);