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
This commit is contained in:
Amith Yamasani
2016-04-20 16:19:44 +00:00
committed by Android (Google) Code Review
parent e6be9c58cc 37f9de996e
commit ea61e63bf8
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); mServiceStub.initForUser(userHandle);
} }
@Override
public void onUnlockUser(int userHandle) {
mServiceStub.initForUser(userHandle);
mServiceStub.switchImplementationIfNeeded(false);
}
@Override @Override
public void onSwitchUser(int userHandle) { public void onSwitchUser(int userHandle) {
mServiceStub.switchUser(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) { void switchImplementationIfNeededLocked(boolean force) {
if (!mSafeMode) { if (!mSafeMode) {
String curService = Settings.Secure.getStringForUser( String curService = Settings.Secure.getStringForUser(