Merge "Use shell package name when starting activities" into qt-r1-dev (f4b0c2b3) · Commits · e / os / android_frameworks_base

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