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

Commit 9fb0e97e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Workaround for assist crash with multiwindow" into nyc-dev

parents f9f48ecd 02c80c63

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