Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2cd6ecda90

Change-Id: I96bc422662f7b86fbfd1d65024771492caea5bb5
This commit is contained in:
Andrii Kulian
2019-07-31 16:19:28 -07:00
committed by android-build-merger
parent 23ae47a8d7 2cd6ecda90
commit a023a7ae5a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
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);
} }