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

Commit 32257dbb authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Use correct synchronization lock" into nyc-dev 

am: 638cc6ca

* commit '638cc6ca':
  Use correct synchronization lock

Change-Id: Ibc7475f21c585ae457412214986cc14ac9ecbe8b
parents 96491460 638cc6ca

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) {