Merge "Fix a regression in assist when context is disabled" into nyc-dev (c3c45fa2) · Commits · e / os / android_frameworks_base

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java

+20 −12

Original line number	Diff line number	Diff line
		@@ -370,6 +370,13 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
		}
		if (mHaveAssistData) {
		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()) {
		if (mPendingAssistDataCount <= 0) {
		Slog.e(TAG, "mPendingAssistDataCount is " + mPendingAssistDataCount);
		@@ -386,6 +393,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
		deliverSessionDataLocked(assistData);
		}
		}
		}
		if (mPendingAssistDataCount <= 0) {
		mHaveAssistData = false;
		} // else, more to come