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

Also reset assist setting when force stopping assist

Browse Source 
Bug: 20882522
Change-Id: I57725586ab5ff203b378a1e6d2e5e77a47fd2448
This commit is contained in:
Jorim Jaggi
2015-06-25 15:55:43 -07:00
parent 450176c52c
commit cc3a46ada8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,6 +433,11 @@ public class VoiceInteractionManagerService extends SystemService {
+ " user=" + userHandle); + " user=" + userHandle);
} }
void resetCurAssistant(int userHandle) {
Settings.Secure.putStringForUser(mContext.getContentResolver(),
Settings.Secure.ASSISTANT, null, userHandle);
}
@Override @Override
public void showSession(IVoiceInteractionService service, Bundle args, int flags) { public void showSession(IVoiceInteractionService service, Bundle args, int flags) {
synchronized (this) { synchronized (this) {
@@ -897,6 +902,7 @@ public class VoiceInteractionManagerService extends SystemService {
} }
setCurInteractor(null, userHandle); setCurInteractor(null, userHandle);
setCurRecognizer(null, userHandle); setCurRecognizer(null, userHandle);
resetCurAssistant(userHandle);
initForUser(userHandle); initForUser(userHandle);
switchImplementationIfNeededLocked(true); switchImplementationIfNeededLocked(true);
} }