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

Commit 11543a1b authored by Chris Thornton's avatar Chris Thornton Committed by Android Git Automerger
Browse files

am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition... 

am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev

* commit 'ea5ad487':
  Don't call StopRecognition when recognition was aborted.
parents 522222bc ea5ad487

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

+11 −4
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 
    // This is an indirect indication of the microphone being open in some other application.

    // This is an indirect indication of the microphone being open in some other application.

    private boolean mServiceDisabled = false;

    private boolean mServiceDisabled = false;

    private boolean mStarted = false;

    private boolean mStarted = false;

    private boolean mRecognitionAborted = false;

    private PowerSaveModeListener mPowerSaveModeListener;

    private PowerSaveModeListener mPowerSaveModeListener;





    SoundTriggerHelper(Context context) {

    SoundTriggerHelper(Context context) {
@@ -386,8 +387,9 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 




    private void onRecognitionAbortLocked() {

    private void onRecognitionAbortLocked() {

        Slog.w(TAG, "Recognition aborted");

        Slog.w(TAG, "Recognition aborted");

        // No-op

        // If abort has been called, the hardware has already stopped recognition, so we shouldn't

        // This is handled via service state changes instead.

        // call it again when we process the state change.

        mRecognitionAborted = true;

    }

    }





    private void onRecognitionFailureLocked() {

    private void onRecognitionFailureLocked() {
@@ -490,8 +492,13 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 
            }

            }

            return status;

            return status;

        } else {

        } else {

            // Stop recognition.

            // Stop recognition (only if we haven't been aborted).

            int status = mModule.stopRecognition(mCurrentSoundModelHandle);

            int status = STATUS_OK;

            if (!mRecognitionAborted) {

                status = mModule.stopRecognition(mCurrentSoundModelHandle);

            } else {

                mRecognitionAborted = false;

            }

            if (status != SoundTrigger.STATUS_OK) {

            if (status != SoundTrigger.STATUS_OK) {

                Slog.w(TAG, "stopRecognition call failed with " + status);

                Slog.w(TAG, "stopRecognition call failed with " + status);

                if (notify) {

                if (notify) {