commit fa52aacca9378409c29a8cb68ce0a9f7484b9547
author Amith Yamasani <yamasani@google.com> Mon May 09 12:46:23 2016 -0700
committer The Android Automerger <android-build@google.com> Mon May 09 17:29:52 2016 -0700
tree b01012da814f07e6f1eced2e89dbe5bd8fd0fac0
parent a02268f2f2127b0618269801fe6713f26994d953

Workaround for assist crash with multiwindow

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

Change-Id: Ia9d0fb5d4412e87aada90e8dcffe829b61221c6c

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java

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