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

Commit 42449786 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Throw better exception when startVoiceActivity fails 

Introduced new error codes so that Instrumentation can
include the correct message in the exception.

Bug: 28216630
Change-Id: I93ee77153cdad11fa208c74c28c6790db27c9753
parent 8dd32a56

core/java/android/app/ActivityManager.java

+13 −0
Original line number Diff line number Diff line
@@ -125,6 +125,19 @@ public class ActivityManager { 
     */

    public static final String META_HOME_ALTERNATE = "android.app.home.alternate";



    /**

     * Result for IActivityManager.startVoiceActivity: active session is currently hidden.

     * @hide

     */

    public static final int START_VOICE_HIDDEN_SESSION = -10;



    /**

     * Result for IActivityManager.startVoiceActivity: active session does not match

     * the requesting token.

     * @hide

     */

    public static final int START_VOICE_NOT_ACTIVE_SESSION = -9;



    /**

     * Result for IActivityManager.startActivity: trying to start a background user

     * activity that shouldn't be displayed for all users.

core/java/android/app/Instrumentation.java

+10 −1
Original line number Diff line number Diff line
@@ -1820,6 +1820,15 @@ public class Instrumentation { 
            case ActivityManager.START_NOT_VOICE_COMPATIBLE:

                throw new SecurityException(

                        "Starting under voice control not allowed for: " + intent);

            case ActivityManager.START_VOICE_NOT_ACTIVE_SESSION:

                throw new IllegalStateException(

                        "Session calling startVoiceActivity does not match active session");

            case ActivityManager.START_VOICE_HIDDEN_SESSION:

                throw new IllegalStateException(

                        "Cannot start voice activity on a hidden session");

            case ActivityManager.START_CANCELED:

                throw new AndroidRuntimeException("Activity could not be started for "

                        + intent);

            default:

                throw new AndroidRuntimeException("Unknown error code "

                        + res + " when starting " + intent);

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -183,11 +183,11 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne 
        try {

            if (mActiveSession == null || token != mActiveSession.mToken) {

                Slog.w(TAG, "startVoiceActivity does not match active session");

                return ActivityManager.START_CANCELED;

                return ActivityManager.START_VOICE_NOT_ACTIVE_SESSION;

            }

            if (!mActiveSession.mShown) {

                Slog.w(TAG, "startVoiceActivity not allowed on hidden session");

                return ActivityManager.START_CANCELED;

                return ActivityManager.START_VOICE_HIDDEN_SESSION;

            }

            intent = new Intent(intent);

            intent.addCategory(Intent.CATEGORY_VOICE);