commit 7bb958f8db1af43c97cc3345aada5d6f3231c2a4
author Tony Mak <tonymak@google.com> Wed Jan 24 15:11:06 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 24 22:30:57 2018 +0000
tree f7d802b433e32b8c69cc705a13d54e6fa8397cc5
parent cc254aff4a6a4aea63b2275d995fe7ba66d13ba4

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
(cherry picked from commit 793e14d094c1534c8aa78741734f8b274ca2f1cf)

services/core/java/com/android/server/am/ActivityStartController.java

diff --git a/services/core/java/com/android/server/am/ActivityStartController.java b/services/core/java/com/android/server/am/ActivityStartController.java
index f9932b2..5551914 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 @@
         }
     }
 
-    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) {