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

Commit bef1d1a1 authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "Return error code when there's an error starting an activity" into main... 

Merge "Return error code when there's an error starting an activity" into main am: 8d40ab04 am: 64632eed am: d741afd4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2693071



Change-Id: Icd1ff0dbbf8dedf65a208c6cd6d43407f56fa0bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 479f9bf3 d741afd4

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+7 −7
Original line number Diff line number Diff line
@@ -761,37 +761,37 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                    out.println(

                            "Error: Activity not started, unable to "

                                    + "resolve " + intent.toString());

                    break;

                    return 1;

                case ActivityManager.START_CLASS_NOT_FOUND:

                    out.println(NO_CLASS_ERROR_CODE);

                    out.println("Error: Activity class " +

                            intent.getComponent().toShortString()

                            + " does not exist.");

                    break;

                    return 1;

                case ActivityManager.START_FORWARD_AND_REQUEST_CONFLICT:

                    out.println(

                            "Error: Activity not started, you requested to "

                                    + "both forward and receive its result");

                    break;

                    return 1;

                case ActivityManager.START_PERMISSION_DENIED:

                    out.println(

                            "Error: Activity not started, you do not "

                                    + "have permission to access it.");

                    break;

                    return 1;

                case ActivityManager.START_NOT_VOICE_COMPATIBLE:

                    out.println(

                            "Error: Activity not started, voice control not allowed for: "

                                    + intent);

                    break;

                    return 1;

                case ActivityManager.START_NOT_CURRENT_USER_ACTIVITY:

                    out.println(

                            "Error: Not allowed to start background user activity"

                                    + " that shouldn't be displayed for all users.");

                    break;

                    return 1;

                default:

                    out.println(

                            "Error: Activity not started, unknown error code " + res);

                    break;

                    return 1;

            }

            out.flush();

            if (mWaitOption && launched) {