Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-09 21:03:59 +00:00
committed by Android (Google) Code Review
parent f9f48ecd4c 02c80c63d4
commit 9fb0e97ecb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
View File

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