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

Browse Source 
am: 32257dbb4d

* commit '32257dbb4dffb680445d6a18a7418fb95cf63171':
  Use correct synchronization lock

Change-Id: Ia95571c01a08d2eed39f1c4a6b0266578578956a
This commit is contained in:
Amith Yamasani
2016-05-24 18:38:58 +00:00
committed by android-build-merger
parent 88873f92ab 32257dbb4d
commit 663cf283de
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) {