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 
am: 9fb0e97ecb

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

Change-Id: Ia026329d903ed525990614f9b046bbed3579a96b
This commit is contained in:
Amith Yamasani
2016-05-09 21:11:33 +00:00
committed by android-build-merger
parent 2c3f791150 9fb0e97ecb
commit d740e158cc
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) {
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);