Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08bc6c68 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Workaround for assist crash with multiwindow" into nyc-dev am: 9fb0e97e am: 6ee39c80 

am: 9b0330f8

* commit '9b0330f8':
  Workaround for assist crash with multiwindow

Change-Id: I898655d5c411c4550943e68d79ea800f16e2dc6f
parents fb7b745e 9b0330f8

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -251,7 +251,8 @@ final class VoiceInteractionSessionConnection implements ServiceConnection { 
                        && structureEnabled) {

                        && structureEnabled) {

                    mAssistData.clear();

                    mAssistData.clear();

                    final int count = activityToken != null ? 1 : topActivities.size();

                    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);

                        IBinder topActivity = count == 1 ? activityToken : topActivities.get(i);

                        try {

                        try {

                            MetricsLogger.count(mContext, "assist_with_context", 1);

                            MetricsLogger.count(mContext, "assist_with_context", 1);