From 793e14d094c1534c8aa78741734f8b274ca2f1cf Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Wed, 24 Jan 2018 15:11:06 +0000 Subject: Swap the order of realCallingUid and realCallingPid in startActivityInPackage Checked ag/3483468, we are always passing pid first, let's swap the order then. Test: Setup work profile -> add work account Fix: 72429434 Change-Id: I8fd05b42fa22a3e46a87b3f6a0902e0e5a797dc9 --- services/core/java/com/android/server/am/ActivityStartController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStartController.java b/services/core/java/com/android/server/am/ActivityStartController.java index f9932b20fb5b..5551914f7063 100644 --- a/services/core/java/com/android/server/am/ActivityStartController.java +++ b/services/core/java/com/android/server/am/ActivityStartController.java @@ -220,7 +220,7 @@ public class ActivityStartController { } } - final int startActivityInPackage(int uid, int realCallingUid, int realCallingPid, + final int startActivityInPackage(int uid, int realCallingPid, int realCallingUid, String callingPackage, Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode, int startFlags, SafeActivityOptions options, int userId, TaskRecord inTask, String reason) { -- cgit v1.2.3-59-g8ed1b