From eab3c90103c25a6cbeb0989847a687b39158384e Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Tue, 23 Jul 2019 19:32:39 -0700 Subject: Use shell package name when starting activities When starting activities from shell it was passing null calling package name, which failed the uid-package match verification. Bug: 138224633 Test: atest CtsWindowManagerDeviceTestCases:ActivityVisibilityTests Change-Id: I5640b2b89d43b47e1573ce79758903394ea8c9a9 --- .../core/java/com/android/server/am/ActivityManagerShellCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index cba9674d7360..26b3f435dea1 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -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); } -- cgit v1.2.3-59-g8ed1b