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

am: 952d68fa85 Change-Id: Ic1dfd9537fb97bf896ac73709d900023696bf14a
2017-05-31 00:21:35 +00:00
parent e322d120cc 952d68fa85
commit 84f5455586
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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;