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

Fix issue #30929080: Default Assist app is set to None...

Browse Source 
am: e9563659a5

Change-Id: I738c1126ffbffaa904e7d4533347a218a0ccecdd
This commit is contained in:
Dianne Hackborn
2016-08-23 14:51:30 +00:00
committed by android-build-merger
parent a09f3f28ef e9563659a5
commit 5cb766a9cd
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -535,6 +535,18 @@ public class VoiceInteractionManagerService extends SystemService {
+ " user=" + userHandle);
}
ComponentName getCurAssistant(int userHandle) {
String curAssistant = Settings.Secure.getStringForUser(
mContext.getContentResolver(),
Settings.Secure.ASSISTANT, userHandle);
if (TextUtils.isEmpty(curAssistant)) {
return null;
}
if (DEBUG) Slog.d(TAG, "getCurAssistant curAssistant=" + curAssistant
+ " user=" + userHandle);
return ComponentName.unflattenFromString(curAssistant);
}
void resetCurAssistant(int userHandle) {
Settings.Secure.putStringForUser(mContext.getContentResolver(),
Settings.Secure.ASSISTANT, null, userHandle);
@@ -1178,6 +1190,7 @@ public class VoiceInteractionManagerService extends SystemService {
synchronized (VoiceInteractionManagerServiceStub.this) {
ComponentName curInteractor = getCurInteractor(userHandle);
ComponentName curRecognizer = getCurRecognizer(userHandle);
ComponentName curAssistant = getCurAssistant(userHandle);
if (curRecognizer == null) {
// Could a new recognizer appear when we don't have one pre-installed?
if (anyPackagesAppearing()) {
@@ -1196,6 +1209,7 @@ public class VoiceInteractionManagerService extends SystemService {
// the default config.
setCurInteractor(null, userHandle);
setCurRecognizer(null, userHandle);
resetCurAssistant(userHandle);
initForUser(userHandle);
return;
}
@@ -1212,6 +1226,20 @@ public class VoiceInteractionManagerService extends SystemService {
return;
}
if (curAssistant != null) {
int change = isPackageDisappearing(curAssistant.getPackageName());
if (change == PACKAGE_PERMANENT_CHANGE) {
// If the currently set assistant is being removed, then we should
// reset back to the default state (which is probably that we prefer
// to have the default full voice interactor enabled).
setCurInteractor(null, userHandle);
setCurRecognizer(null, userHandle);
resetCurAssistant(userHandle);
initForUser(userHandle);
return;
}
}
// There is no interactor, so just deal with a simple recognizer.
int change = isPackageDisappearing(curRecognizer.getPackageName());
if (change == PACKAGE_PERMANENT_CHANGE