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 
am: 7aa28bd502

Change-Id: I9095ebe2537bb4b8344fb31d35e544d978082aee
This commit is contained in:
Felipe Leme
2019-05-22 00:12:48 -07:00
committed by android-build-merger
parent 1708797588 7aa28bd502
commit 395118e622
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) {
final ActivityClientRecord r = mActivities.get(activityToken);
if (r == null) {
Log.w(TAG, "requestDirectActions(): no activity for " + activityToken);
callback.sendResult(null);
return;
}
final int lifecycleState = r.getLifecycleState();
if (lifecycleState < ON_START || lifecycleState >= ON_STOP) {
Log.w(TAG, "requestDirectActions(" + r + "): wrong lifecycle: " + lifecycleState);
callback.sendResult(null);
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);
}
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)) {