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

Merge "Reinitialize voice interaction service on unlock" into nyc-dev

Browse Source 
am: ea61e63

* commit 'ea61e63bf8f1f92a837fc42eed037aabaa8d03b9':
  Reinitialize voice interaction service on unlock

Change-Id: I2dd39bb3a2543710c6c5de01878f915d52e4f95c
This commit is contained in:
Amith Yamasani
2016-04-20 16:24:31 +00:00
committed by android-build-merger
parent 11939b159d ea61e63bf8
commit 9db92ccd77
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,12 @@ public class VoiceInteractionManagerService extends SystemService {
mServiceStub.initForUser(userHandle);
}
@Override
public void onUnlockUser(int userHandle) {
mServiceStub.initForUser(userHandle);
mServiceStub.switchImplementationIfNeeded(false);
}
@Override
public void onSwitchUser(int userHandle) {
mServiceStub.switchUser(userHandle);
@@ -362,6 +368,12 @@ public class VoiceInteractionManagerService extends SystemService {
}
}
void switchImplementationIfNeeded(boolean force) {
synchronized (this) {
switchImplementationIfNeededLocked(force);
}
}
void switchImplementationIfNeededLocked(boolean force) {
if (!mSafeMode) {
String curService = Settings.Secure.getStringForUser(