diff options
| author | 2020-07-06 22:21:25 +0000 | |
|---|---|---|
| committer | 2020-07-06 22:21:25 +0000 | |
| commit | 3fd2f785c7e0eeddf03de8b75b7316bf4d5e73c1 (patch) | |
| tree | 43fc5f2f9eac9c2252a89f42a7885075daba24cb | |
| parent | 0c298c58054531198a78f469511babcb703797d0 (diff) | |
| parent | 235421ccd4db74809f4206c0924ac112516435c3 (diff) | |
Merge "Check PendingStartActivityUids in getAppStartModeLocked." into rvc-dev am: 66929380ab am: 235421ccd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055922
Change-Id: I438d0a062ba13dd7f64238828c41cee1a9909eab
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index a38d42b92600..a2f76e99810c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -6334,6 +6334,9 @@ public class ActivityManagerService extends IActivityManager.Stub int getAppStartModeLocked(int uid, String packageName, int packageTargetSdk, int callingPid, boolean alwaysRestrict, boolean disabledOnly, boolean forcedStandby) { + if (mInternal.isPendingTopUid(uid)) { + return ActivityManager.APP_START_MODE_NORMAL; + } UidRecord uidRec = mProcessList.getUidRecordLocked(uid); if (DEBUG_BACKGROUND_CHECK) Slog.d(TAG, "checkAllowBackground: uid=" + uid + " pkg=" + packageName + " rec=" + uidRec + " always=" + alwaysRestrict + " idle=" |