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: I6209180e67e91ac264e50be957d87c2d897bcc3c
This commit is contained in:
Amith Yamasani
2016-04-23 01:01:58 +00:00
committed by android-build-merger
parent 2494361b0b c3c45fa2e0
commit 40411c158c
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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