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

Commit 9b0330f8 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

* commit '6ee39c80':
  Workaround for assist crash with multiwindow

Change-Id: I57b007fb123d49de6a784f1f0efc5fb82c089f8c
parents 8eeefb18 6ee39c80

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

+2 −1
Original line number Diff line number Diff line
@@ -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);