commit 16979eab19b152c54073c8a4f83f35efdd4ef31d
author Amith Yamasani <yamasani@google.com> Mon Sep 24 18:14:47 2012 -0700
committer Amith Yamasani <yamasani@google.com> Mon Sep 24 18:14:47 2012 -0700
tree a8141e69127c78ad1c0a0ac36b131a8d8c9cd4a4
parent 6bd69aec538413fbf6fd9d25ff0b00049ce9a096

Fix build

Merge error...

Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 1b8ea42..9b7ed22 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -2628,7 +2628,7 @@
             Intent[] intents, String[] resolvedTypes, IBinder resultTo, Bundle options,
             int userId) {
         enforceNotIsolatedCaller("startActivities");
-        userId = handleIncomingUserLocked(Binder.getCallingPid(), Binder.getCallingUid(), userId,
+        userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId,
                 false, true, "startActivity", null);
         int ret = mMainStack.startActivities(caller, -1, intents, resolvedTypes, resultTo,
                 options, userId);