Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1032d86f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by android-build-merger
Browse files

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

am: 40411c15

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

Change-Id: I5beebccebd76317f06e545bbea57e999b8cdbe06
parents 183a0eab 40411c15

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