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

Merge changes from topic "aug25"

Browse Source 
* changes:
  [5/?] Reduce BroadcastQueue interface complexity.
  [4/?] Reduce BroadcastQueue interface complexity.
  [3/?] Reduce BroadcastQueue interface complexity.
This commit is contained in:
Jeff Sharkey
2022-08-26 20:07:58 +00:00
committed by Android (Google) Code Review
parent a6ee9cb4cf 8341514bf6
commit a400b6307e
4 changed files with 71 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4600,6 +4600,10 @@ public class ActivityManagerService extends IActivityManager.Stub
mCpHelper.cleanupAppInLaunchingProvidersLocked(app, true);
// Take care of any services that are waiting for the process.
mServices.processStartTimedOutLocked(app);
// Take care of any broadcasts waiting for the process.
for (BroadcastQueue queue : mBroadcastQueues) {
queue.onApplicationTimeoutLocked(app);
}
if (!isKillTimeout) {
mBatteryStatsService.noteProcessFinish(app.processName, app.info.uid);
app.killLocked("start timeout",
@@ -4631,16 +4635,6 @@ public class ActivityManagerService extends IActivityManager.Stub
}
});
}
if (!isKillTimeout) {
if (isPendingBroadcastProcessLocked(pid)) {
Slog.w(TAG, "Unattached app died before broadcast acknowledged, skipping");
skipPendingBroadcastLocked(pid);
}
} else {
if (isPendingBroadcastProcessLocked(app)) {
skipCurrentReceiverLocked(app);
}
}
} else {
Slog.w(TAG, "Spurious process start timeout - pid not known for " + app);
}
@@ -4960,15 +4954,13 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
if (!badApp) {
updateUidReadyForBootCompletedBroadcastLocked(app.uid);
}
// Check if a next-broadcast receiver is in this process...
if (!badApp && isPendingBroadcastProcessLocked(pid)) {
if (!badApp) {
try {
didSomething |= sendPendingBroadcastsLocked(app);
checkTime(startTime, "attachApplicationLocked: after sendPendingBroadcastsLocked");
for (BroadcastQueue queue : mBroadcastQueues) {
didSomething |= queue.onApplicationAttachedLocked(app);
}
checkTime(startTime, "attachApplicationLocked: after dispatching broadcasts");
} catch (Exception e) {
// If the app died trying to launch the receiver we declare it 'bad'
Slog.wtf(TAG, "Exception thrown dispatching broadcasts in " + app, e);
@@ -8355,12 +8347,6 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
void skipCurrentReceiverLocked(ProcessRecord app) {
for (BroadcastQueue queue : mBroadcastQueues) {
queue.skipCurrentReceiverLocked(app);
}
}
/**
* Used by {@link com.android.internal.os.RuntimeInit} to report when an application crashes.
* The application process will exit immediately after this call returns.
@@ -12373,7 +12359,9 @@ public class ActivityManagerService extends IActivityManager.Stub
mOomAdjuster.mCachedAppOptimizer.onCleanupApplicationRecordLocked(app);
}
mAppProfiler.onCleanupApplicationRecordLocked(app);
skipCurrentReceiverLocked(app);
for (BroadcastQueue queue : mBroadcastQueues) {
queue.onApplicationCleanupLocked(app);
}
updateProcessForegroundLocked(app, false, 0, false);
mServices.killServicesLocked(app, allowRestart);
mPhantomProcessList.onAppDied(pid);
@@ -13080,48 +13068,6 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
boolean isPendingBroadcastProcessLocked(int pid) {
for (BroadcastQueue queue : mBroadcastQueues) {
BroadcastRecord r = queue.getPendingBroadcastLocked();
if (r != null && r.curApp.getPid() == pid) {
return true;
}
}
return false;
}
boolean isPendingBroadcastProcessLocked(ProcessRecord app) {
for (BroadcastQueue queue : mBroadcastQueues) {
BroadcastRecord r = queue.getPendingBroadcastLocked();
if (r != null && r.curApp == app) {
return true;
}
}
return false;
}
void skipPendingBroadcastLocked(int pid) {
Slog.w(TAG, "Unattached app died before broadcast acknowledged, skipping");
for (BroadcastQueue queue : mBroadcastQueues) {
queue.skipPendingBroadcastLocked(pid);
}
}
// The app just attached; send any pending broadcasts that it should receive
boolean sendPendingBroadcastsLocked(ProcessRecord app) {
boolean didSomething = false;
for (BroadcastQueue queue : mBroadcastQueues) {
didSomething |= queue.sendPendingBroadcastsLocked(app);
}
return didSomething;
}
void updateUidReadyForBootCompletedBroadcastLocked(int uid) {
for (BroadcastQueue queue : mBroadcastQueues) {
queue.updateUidReadyForBootCompletedBroadcastLocked(uid);
}
}
/**
* @deprecated Use {@link #registerReceiverWithFeature}
*/
@@ -13393,8 +13339,6 @@ public class ActivityManagerService extends IActivityManager.Stub
r.resultAbort, false);
if (doNext) {
doTrim = true;
r.queue.processNextBroadcastLocked(/* frommsg */ false,
/* skipOomAdj */ true);
}
}
@@ -14590,9 +14534,6 @@ public class ActivityManagerService extends IActivityManager.Stub
doNext = r.queue.finishReceiverLocked(r, resultCode,
resultData, resultExtras, resultAbort, true);
}
if (doNext) {
r.queue.processNextBroadcastLocked(/*fromMsg=*/ false, /*skipOomAdj=*/ true);
}
// updateOomAdjLocked() will be done here
trimApplicationsLocked(false, OomAdjuster.OOM_ADJ_REASON_FINISH_RECEIVER);
}

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

@@ -75,14 +75,6 @@ public abstract class BroadcastQueue {
*/
public abstract void enqueueBroadcastLocked(BroadcastRecord r);
public abstract void updateUidReadyForBootCompletedBroadcastLocked(int uid);
public abstract boolean sendPendingBroadcastsLocked(ProcessRecord app);
public abstract void skipPendingBroadcastLocked(int pid);
public abstract void skipCurrentReceiverLocked(ProcessRecord app);
public abstract BroadcastRecord getMatchingOrderedReceiver(IBinder receiver);
/**
@@ -97,7 +89,30 @@ public abstract class BroadcastQueue {
public abstract void backgroundServicesFinishedLocked(int userId);
public abstract void processNextBroadcastLocked(boolean fromMsg, boolean skipOomAdj);
/**
* Signal from OS internals that the given process has just been actively
* attached, and is ready to begin receiving broadcasts.
*/
public abstract boolean onApplicationAttachedLocked(ProcessRecord app);
/**
* Signal from OS internals that the given process has timed out during
* an attempted start and attachment.
*/
public abstract boolean onApplicationTimeoutLocked(ProcessRecord app);
/**
* Signal from OS internals that the given process, which had already been
* previously attached, has now encountered a problem such as crashing or
* not responding.
*/
public abstract boolean onApplicationProblemLocked(ProcessRecord app);
/**
* Signal from OS internals that the given process has been killed, and is
* no longer actively running.
*/
public abstract boolean onApplicationCleanupLocked(ProcessRecord app);
/**
* Signal from OS internals that the given package (or some subset of that

45
services/core/java/com/android/server/am/BroadcastQueueImpl.java
View File

@@ -423,6 +423,28 @@ public class BroadcastQueueImpl extends BroadcastQueue {
scheduleBroadcastsLocked();
}
public boolean onApplicationAttachedLocked(ProcessRecord app) {
updateUidReadyForBootCompletedBroadcastLocked(app.uid);
if (mPendingBroadcast != null && mPendingBroadcast.curApp == app) {
return sendPendingBroadcastsLocked(app);
} else {
return false;
}
}
public boolean onApplicationTimeoutLocked(ProcessRecord app) {
return skipCurrentOrPendingReceiverLocked(app);
}
public boolean onApplicationProblemLocked(ProcessRecord app) {
return skipCurrentOrPendingReceiverLocked(app);
}
public boolean onApplicationCleanupLocked(ProcessRecord app) {
return skipCurrentOrPendingReceiverLocked(app);
}
public boolean sendPendingBroadcastsLocked(ProcessRecord app) {
boolean didSomething = false;
final BroadcastRecord br = mPendingBroadcast;
@@ -452,18 +474,8 @@ public class BroadcastQueueImpl extends BroadcastQueue {
return didSomething;
}
public void skipPendingBroadcastLocked(int pid) {
final BroadcastRecord br = mPendingBroadcast;
if (br != null && br.curApp.getPid() == pid) {
br.state = BroadcastRecord.IDLE;
br.nextReceiver = mPendingBroadcastRecvIndex;
mPendingBroadcast = null;
scheduleBroadcastsLocked();
}
}
// Skip the current receiver, if any, that is in flight to the given process
public void skipCurrentReceiverLocked(ProcessRecord app) {
public boolean skipCurrentOrPendingReceiverLocked(ProcessRecord app) {
BroadcastRecord r = null;
final BroadcastRecord curActive = mDispatcher.getActiveBroadcastLocked();
if (curActive != null && curActive.curApp == app) {
@@ -481,6 +493,9 @@ public class BroadcastQueueImpl extends BroadcastQueue {
if (r != null) {
skipReceiverLocked(r);
return true;
} else {
return false;
}
}
@@ -664,8 +679,12 @@ public class BroadcastQueueImpl extends BroadcastQueue {
// We will process the next receiver right now if this is finishing
// an app receiver (which is always asynchronous) or after we have
// come back from calling a receiver.
return state == BroadcastRecord.APP_RECEIVE
|| state == BroadcastRecord.CALL_DONE_RECEIVE;
final boolean doNext = (state == BroadcastRecord.APP_RECEIVE)
|| (state == BroadcastRecord.CALL_DONE_RECEIVE);
if (doNext) {
processNextBroadcastLocked(/* fromMsg= */ false, /* skipOomAdj= */ true);
}
return doNext;
}
public void backgroundServicesFinishedLocked(int userId) {

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

@@ -605,7 +605,9 @@ class ProcessErrorStateRecord {
mService.mContext, mApp.info.packageName, mApp.info.flags);
}
}
mService.skipCurrentReceiverLocked(mApp);
for (BroadcastQueue queue : mService.mBroadcastQueues) {
queue.onApplicationProblemLocked(mApp);
}
}
@GuardedBy("mService")