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

Commit fd6c09de authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Use shell package name when starting activities" into qt-r1-dev am:... 

Merge "Use shell package name when starting activities" into qt-r1-dev am: 2cd6ecda am: a023a7ae
am: a972f21f

Change-Id: Ie44c6e144667e5759ff56a5c43858eb4cd077d53
parents 7ab6878f a972f21f

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

+2 −2
Original line number Diff line number Diff line
@@ -528,12 +528,12 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                options.setLockTaskEnabled(true);

            }

            if (mWaitOption) {

                result = mInternal.startActivityAndWait(null, null, intent, mimeType,

                result = mInternal.startActivityAndWait(null, SHELL_PACKAGE_NAME, intent, mimeType,

                        null, null, 0, mStartFlags, profilerInfo,

                        options != null ? options.toBundle() : null, mUserId);

                res = result.result;

            } else {

                res = mInternal.startActivityAsUser(null, null, intent, mimeType,

                res = mInternal.startActivityAsUser(null, SHELL_PACKAGE_NAME, intent, mimeType,

                        null, null, 0, mStartFlags, profilerInfo,

                        options != null ? options.toBundle() : null, mUserId);

            }