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

Commit 4d93a505 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

Change-Id: I3753772cd5251ebd2cd54d8d9a3e7cf95cdf5f3e
parents 15ced110 2cd6ecda

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

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

            }