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

Commit f5c37eb3 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Use correct synchronization lock 

This is to fix an incorrect unregister() that was crashing
the system server. The only way it could be happening is
because of incorrect locking. So, hopefully this fixes it.

Bug: 28813750
Change-Id: Ie3c47ffa3024a0c533e12db0d2d021df8fc0367a
parent ff8ceadf

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

+2 −2
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ public class VoiceInteractionManagerService extends SystemService { 
                if (hit && doit) {

                    // The user is force stopping our current interactor/recognizer.

                    // Clear the current settings and restore default state.

                    synchronized (VoiceInteractionManagerService.this) {

                    synchronized (VoiceInteractionManagerServiceStub.this) {

                        unloadAllKeyphraseModels();

                        if (mImpl != null) {

                            mImpl.shutdownLocked();
@@ -1126,7 +1126,7 @@ public class VoiceInteractionManagerService extends SystemService { 
                int userHandle = getChangingUserId();

                if (DEBUG) Slog.d(TAG, "onSomePackagesChanged user=" + userHandle);



                synchronized (VoiceInteractionManagerService.this) {

                synchronized (VoiceInteractionManagerServiceStub.this) {

                    ComponentName curInteractor = getCurInteractor(userHandle);

                    ComponentName curRecognizer = getCurRecognizer(userHandle);

                    if (curRecognizer == null) {