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

Merge "Fix a regression in assist when context is disabled" into nyc-dev

Browse Source 
am: c3c45fa

* commit 'c3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36':
  Fix a regression in assist when context is disabled

Change-Id: Ib12c5e865814f8b3c54c3e862af2191315bbc6e5
This commit is contained in:
Amith Yamasani
2016-04-23 01:02:02 +00:00
committed by android-build-merger
parent 8414b87f6c c3c45fa2e0
commit 074139b878
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,20 +370,28 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
} }
if (mHaveAssistData) { if (mHaveAssistData) {
AssistDataForActivity assistData; AssistDataForActivity assistData;
while (!mAssistData.isEmpty()) { if (mAssistData.isEmpty()) {
if (mPendingAssistDataCount <= 0) { // We're not actually going to get any data, deliver some nothing
Slog.e(TAG, "mPendingAssistDataCount is " + mPendingAssistDataCount); try {
mSession.handleAssist(null, null, null, 0, 0);
} catch (RemoteException e) {
} }
mPendingAssistDataCount--; } else {
assistData = mAssistData.remove(0); while (!mAssistData.isEmpty()) {
if (assistData.data == null) { if (mPendingAssistDataCount <= 0) {
try { Slog.e(TAG, "mPendingAssistDataCount is " + mPendingAssistDataCount);
mSession.handleAssist(null, null, null, assistData.activityIndex, }
assistData.activityCount); mPendingAssistDataCount--;
} catch (RemoteException e) { assistData = mAssistData.remove(0);
if (assistData.data == null) {
try {
mSession.handleAssist(null, null, null, assistData.activityIndex,
assistData.activityCount);
} catch (RemoteException e) {
}
} else {
deliverSessionDataLocked(assistData);
} }
} else {
deliverSessionDataLocked(assistData);
} }
} }
if (mPendingAssistDataCount <= 0) { if (mPendingAssistDataCount <= 0) {