Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 32257dbb4d

Browse Source 
am: 663cf283de

* commit '663cf283de26e9a98df78c14c4b89dfd7c1e60c3':
  Use correct synchronization lock

Change-Id: I4e81d710d3b90faea7d97fc693cd677c6bf230f4
This commit is contained in:
Amith Yamasani
2016-05-24 18:54:49 +00:00
committed by android-build-merger
parent dfcc21c6b9 663cf283de
commit b94fe018e6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
View File

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