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

This commit is contained in:
TreeHugger Robot
2019-07-31 22:53:31 +00:00
committed by Android (Google) Code Review

View File

@@ -510,12 +510,12 @@ final class ActivityManagerShellCommand extends ShellCommand {
options.setLockTaskEnabled(true); options.setLockTaskEnabled(true);
} }
if (mWaitOption) { if (mWaitOption) {
result = mInternal.startActivityAndWait(null, null, intent, mimeType, result = mInternal.startActivityAndWait(null, SHELL_PACKAGE_NAME, intent, mimeType,
null, null, 0, mStartFlags, profilerInfo, null, null, 0, mStartFlags, profilerInfo,
options != null ? options.toBundle() : null, mUserId); options != null ? options.toBundle() : null, mUserId);
res = result.result; res = result.result;
} else { } else {
res = mInternal.startActivityAsUser(null, null, intent, mimeType, res = mInternal.startActivityAsUser(null, SHELL_PACKAGE_NAME, intent, mimeType,
null, null, 0, mStartFlags, profilerInfo, null, null, 0, mStartFlags, profilerInfo,
options != null ? options.toBundle() : null, mUserId); options != null ? options.toBundle() : null, mUserId);
} }