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

Commit 84f54555 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Fix issue #62196301: Pre-O background restrictions allow starts..." into oc-dev 

am: 952d68fa

Change-Id: Ic1dfd9537fb97bf896ac73709d900023696bf14a
parents e322d120 952d68fa

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

+2 −2
Original line number Diff line number Diff line
@@ -8447,8 +8447,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        synchronized (mPidsSelfLocked) {

                            proc = mPidsSelfLocked.get(callingPid);

                        }

                        if (proc != null && proc.curProcState

                                < ActivityManager.PROCESS_STATE_RECEIVER) {

                        if (proc != null &&

                                !ActivityManager.isProcStateBackground(proc.curProcState)) {

                            // Whoever is instigating this is in the foreground, so we will allow it

                            // to go through.

                            return ActivityManager.APP_START_MODE_NORMAL;