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

Commit 0e8c5da1 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

resolve merge conflicts of c02b2ec3 to... 

resolve merge conflicts of c02b2ec3 to stage-aosp-master am: 088849fc
am: f673358b

Change-Id: I31d8689302a010cedfeada7d7cf2bf66fac7b50f
parents d9f2c306 f673358b

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

+1 −1
Original line number Diff line number Diff line
@@ -4394,7 +4394,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // the package was initially frozen through KILL_APPLICATION_MSG, so

            // it doesn't hurt to use it again.)

            forceStopPackageLocked(app.info.packageName, UserHandle.getAppId(app.uid), false,

                    false, true, false, false, UserHandle.getUserId(app.userId), "start failure");

                    false, true, false, false, app.userId, "start failure");

            return false;

        }

    }