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

Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234896

Change-Id: Ibd352a7d0cbb4ad6b5a8724bad64561ceb609e17
This commit is contained in:
Joanne Chung
2021-08-03 13:11:39 +00:00
committed by Automerger Merge Worker
parent 93a74ca03b 6791ed0112
commit e3bcc4a895
1 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1896,17 +1896,19 @@ public class VoiceInteractionManagerService extends SystemService {
String serviceComponentName = serviceInfo.getComponentName()
.flattenToShortString();
String serviceRecognizerName = new ComponentName(pkg,
voiceInteractionServiceInfo.getRecognitionService())
.flattenToShortString();
if (voiceInteractionServiceInfo.getRecognitionService() == null) {
Slog.e(TAG, "The RecognitionService must be set to avoid boot "
+ "loop on earlier platform version. Also make sure that this "
+ "is a valid RecognitionService when running on Android 11 "
+ "or earlier.");
serviceComponentName = "";
}
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.ASSISTANT, serviceComponentName, userId);
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.VOICE_INTERACTION_SERVICE, serviceComponentName,
userId);
return;
}
@@ -1947,6 +1949,29 @@ public class VoiceInteractionManagerService extends SystemService {
}
}
private void resetServicesIfNoRecognitionService(ComponentName serviceComponent,
int userHandle) {
for (ResolveInfo resolveInfo : queryInteractorServices(userHandle,
serviceComponent.getPackageName())) {
VoiceInteractionServiceInfo serviceInfo =
new VoiceInteractionServiceInfo(
mContext.getPackageManager(),
resolveInfo.serviceInfo);
if (!serviceInfo.getSupportsAssist()) {
continue;
}
if (serviceInfo.getRecognitionService() == null) {
Slog.e(TAG, "The RecognitionService must be set to "
+ "avoid boot loop on earlier platform version. "
+ "Also make sure that this is a valid "
+ "RecognitionService when running on Android 11 "
+ "or earlier.");
setCurInteractor(null, userHandle);
resetCurAssistant(userHandle);
}
}
}
PackageMonitor mPackageMonitor = new PackageMonitor() {
@Override
public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) {
@@ -2090,6 +2115,7 @@ public class VoiceInteractionManagerService extends SystemService {
change = isPackageAppearing(curInteractor.getPackageName());
if (change != PACKAGE_UNCHANGED) {
resetServicesIfNoRecognitionService(curInteractor, userHandle);
// If current interactor is now appearing, for any reason, then
// restart our connection with it.
if (mImpl != null && curInteractor.getPackageName().equals(
@@ -2112,6 +2138,13 @@ public class VoiceInteractionManagerService extends SystemService {
initForUser(userHandle);
return;
}
change = isPackageAppearing(curAssistant.getPackageName());
if (change != PACKAGE_UNCHANGED) {
// It is possible to update Assistant without a voice interactor to one
// with a voice-interactor. We should make sure the recognition service
// is set to avoid boot loop.
resetServicesIfNoRecognitionService(curAssistant, userHandle);
}
}
// There is no interactor, so just deal with a simple recognizer.