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

BroadcastQueue: temporarily unfreeze for parallel broadcasts am: 59b852c407

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12980152

Change-Id: I419cd16a919ea6e44c2b67f1e97e447b2399674d
This commit is contained in:
Marco Ballesio
2020-11-10 20:12:28 +00:00
committed by Automerger Merge Worker
parent a9a9fbc5cd 59b852c407
commit e69ffb6c46
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/BroadcastQueue.java
View File

@@ -791,7 +791,10 @@ public final class BroadcastQueue {
mService.updateOomAdjLocked(r.curApp, true, mService.updateOomAdjLocked(r.curApp, true,
OomAdjuster.OOM_ADJ_REASON_START_RECEIVER); OomAdjuster.OOM_ADJ_REASON_START_RECEIVER);
} }
} else if (filter.receiverList.app != null) {
mService.mOomAdjuster.mCachedAppOptimizer.unfreezeTemporarily(filter.receiverList.app);
} }
try { try {
if (DEBUG_BROADCAST_LIGHT) Slog.i(TAG_BROADCAST, if (DEBUG_BROADCAST_LIGHT) Slog.i(TAG_BROADCAST,
"Delivering to " + filter + " : " + r); "Delivering to " + filter + " : " + r);
@@ -1121,6 +1124,10 @@ public final class BroadcastQueue {
} }
} }
if (sendResult) { if (sendResult) {
if (r.callerApp != null) {
mService.mOomAdjuster.mCachedAppOptimizer.unfreezeTemporarily(
r.callerApp);
}
try { try {
if (DEBUG_BROADCAST) { if (DEBUG_BROADCAST) {
Slog.i(TAG_BROADCAST, "Finishing broadcast [" + mQueueName + "] " Slog.i(TAG_BROADCAST, "Finishing broadcast [" + mQueueName + "] "

10
services/core/java/com/android/server/am/CachedAppOptimizer.java
View File

@@ -720,6 +720,16 @@ public final class CachedAppOptimizer {
} }
} }
// This will ensure app will be out of the freezer for at least FREEZE_TIMEOUT_MS
void unfreezeTemporarily(ProcessRecord app) {
synchronized (mAm) {
if (app.frozen) {
unfreezeAppLocked(app);
freezeAppAsync(app);
}
}
}
@GuardedBy("mAm") @GuardedBy("mAm")
void freezeAppAsync(ProcessRecord app) { void freezeAppAsync(ProcessRecord app) {
mFreezeHandler.removeMessages(SET_FROZEN_PROCESS_MSG, app); mFreezeHandler.removeMessages(SET_FROZEN_PROCESS_MSG, app);