Merge "Fix build" into jb-mr1-dev

2012-09-24 18:16:44 -07:00
parent 51f36148b7 16979eab19
commit 9ed67e83b2
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -2628,7 +2628,7 @@ public final class ActivityManagerService extends ActivityManagerNative
            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);