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

Commit 955c0a79 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes"... 

Merge "Reset HotwordDetectionConnection when VoiceInteractionService crashes" into sc-dev am: a687e13f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15269082

Change-Id: If2850e102d85b1b86b22cf8a14031ce367a68739
parents 8f317f24 a687e13f

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

+24 −1
Original line number Diff line number Diff line
@@ -126,6 +126,9 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne 
    final ServiceConnection mConnection = new ServiceConnection() {

        @Override

        public void onServiceConnected(ComponentName name, IBinder service) {

            if (DEBUG) {

                Slog.d(TAG, "onServiceConnected to " + name + " for user(" + mUser + ")");

            }

            synchronized (mServiceStub) {

                mService = IVoiceInteractionService.Stub.asInterface(service);

                try {
@@ -137,7 +140,13 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne 


        @Override

        public void onServiceDisconnected(ComponentName name) {

            if (DEBUG) {

                Slog.d(TAG, "onServiceDisconnected to " + name);

            }

            synchronized (mServiceStub) {

                mService = null;

                resetHotwordDetectionConnectionLocked();

            }

        }

    };
@@ -575,6 +584,20 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne 
        mHotwordDetectionConnection.forceRestart();

    }



    void resetHotwordDetectionConnectionLocked() {

        if (DEBUG) {

            Slog.d(TAG, "resetHotwordDetectionConnectionLocked");

        }

        if (mHotwordDetectionConnection == null) {

            if (DEBUG) {

                Slog.w(TAG, "reset, but no hotword detection connection");

            }

            return;

        }

        mHotwordDetectionConnection.cancelLocked();

        mHotwordDetectionConnection = null;

    }



    public void dumpLocked(FileDescriptor fd, PrintWriter pw, String[] args) {

        if (!mValid) {

            pw.print("  NOT VALID: ");