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

Merge "Minor improvements on voice interaction workflows." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-21 21:05:41 +00:00
committed by Android (Google) Code Review
parent 848b984715 ada5184574
commit 7aa28bd502
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -3554,11 +3554,13 @@ public final class ActivityThread extends ClientTransactionHandler {
@NonNull RemoteCallback callback) { @NonNull RemoteCallback callback) {
final ActivityClientRecord r = mActivities.get(activityToken); final ActivityClientRecord r = mActivities.get(activityToken);
if (r == null) { if (r == null) {
Log.w(TAG, "requestDirectActions(): no activity for " + activityToken);
callback.sendResult(null); callback.sendResult(null);
return; return;
} }
final int lifecycleState = r.getLifecycleState(); final int lifecycleState = r.getLifecycleState();
if (lifecycleState < ON_START || lifecycleState >= ON_STOP) { if (lifecycleState < ON_START || lifecycleState >= ON_STOP) {
Log.w(TAG, "requestDirectActions(" + r + "): wrong lifecycle: " + lifecycleState);
callback.sendResult(null); callback.sendResult(null);
return; return;
} }

8
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -1452,7 +1452,13 @@ public class AudioService extends IAudioService.Stub
Settings.Secure.ASSISTANT, UserHandle.USER_CURRENT); Settings.Secure.ASSISTANT, UserHandle.USER_CURRENT);
} }
if (!TextUtils.isEmpty(assistantName)) { if (!TextUtils.isEmpty(assistantName)) {
packageName = ComponentName.unflattenFromString(assistantName).getPackageName(); ComponentName componentName = ComponentName.unflattenFromString(assistantName);
if (componentName == null) {
Slog.w(TAG, "Invalid service name for "
+ Settings.Secure.VOICE_INTERACTION_SERVICE + ": " + assistantName);
return;
}
packageName = componentName.getPackageName();
} }
} }
if (!TextUtils.isEmpty(packageName)) { if (!TextUtils.isEmpty(packageName)) {