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

Commit 172175fe authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 05f1f0ec: am 555b07df: am 2c64b539: am 596532d9: Properly initialize... 

am 05f1f0ec: am 555b07df: am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed.

* commit '05f1f0ec':
  Properly initialize recognition service if the recognizer component changed.
parents 806f133e 05f1f0ec

services/java/com/android/server/RecognitionManagerService.java

+5 −7
Original line number Diff line number Diff line
@@ -89,17 +89,15 @@ public class RecognitionManagerService extends Binder { 
    private void initForUser(int userHandle) {

        if (DEBUG) Slog.i(TAG, "initForUser user=" + userHandle);

        ComponentName comp = getCurRecognizer(userHandle);

        ServiceInfo info = null;

        if (comp != null) {

            // See if the current recognizer is no longer available.

            // See if the current recognizer is still available.

            try {

                mIPm.getServiceInfo(comp, 0, userHandle);

                info = mIPm.getServiceInfo(comp, 0, userHandle);

            } catch (RemoteException e) {

                comp = findAvailRecognizer(null, userHandle);

                if (comp != null) {

                    setCurRecognizer(comp, userHandle);

            }

        }

        } else {

        if (info == null) {

            comp = findAvailRecognizer(null, userHandle);

            if (comp != null) {

                setCurRecognizer(comp, userHandle);