Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dianne Hackborn
2017-05-31 00:12:58 +00:00
committed by Android (Google) Code Review
parent 9c1b222fc1 abe2a94853
commit 952d68fa85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -8447,8 +8447,8 @@ public class ActivityManagerService extends IActivityManager.Stub
synchronized (mPidsSelfLocked) { synchronized (mPidsSelfLocked) {
proc = mPidsSelfLocked.get(callingPid); proc = mPidsSelfLocked.get(callingPid);
} }
if (proc != null && proc.curProcState if (proc != null &&
< ActivityManager.PROCESS_STATE_RECEIVER) { !ActivityManager.isProcStateBackground(proc.curProcState)) {
// Whoever is instigating this is in the foreground, so we will allow it // Whoever is instigating this is in the foreground, so we will allow it
// to go through. // to go through.
return ActivityManager.APP_START_MODE_NORMAL; return ActivityManager.APP_START_MODE_NORMAL;