Fix build

Merge error... Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6
2012-09-24 18:14:47 -07:00
parent 6bd69aec53
commit 16979eab19
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);