Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aa28bd5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 848b9847 ada51845

core/java/android/app/ActivityThread.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

        }

services/core/java/com/android/server/audio/AudioService.java

+7 −1
Original line number Diff line number Diff line
@@ -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)) {