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

am: a972f21f17

Change-Id: Ie44c6e144667e5759ff56a5c43858eb4cd077d53
This commit is contained in:
Andrii Kulian
2019-07-31 17:17:36 -07:00
committed by android-build-merger

View File

@@ -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);
}