diff options
| author | 2018-01-24 15:31:34 +0000 | |
|---|---|---|
| committer | 2018-01-24 15:31:34 +0000 | |
| commit | df64ef9be42b55e94b8da1f4b41acbd75bdd475f (patch) | |
| tree | da67e265be97110164afbb8615a7bc3ddc93f1a1 | |
| parent | 7c4cc2ea8c5d04fb1d836b3cef6c20fd9ab5202b (diff) | |
| parent | 793e14d094c1534c8aa78741734f8b274ca2f1cf (diff) | |
Merge "Swap the order of realCallingUid and realCallingPid in startActivityInPackage"
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStartController.java | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |