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

Commit 28169f01 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: 2cd6ecda 

am: a023a7ae

Change-Id: I07830062024c039a24a271e9f8dd91b5c8f46011
parents 7eee6207 a023a7ae

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

+2 −2
Original line number Diff line number Diff line
@@ -510,12 +510,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);

            }