Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95293865 authored by Amith Yamasani's avatar Amith Yamasani Committed by Jean-Baptiste Queru
Browse files

Fix build 

Merge error...

Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6
parent 0dfe1cf3

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

+1 −1
Original line number Diff line number Diff line
@@ -2626,7 +2626,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);