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

Merge "Make flushing broadcast loopers optional." into udc-dev am: 3e7d7d6398

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

Change-Id: I663c2a4523d2ba3c91c7b77d9544be3113d49fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sudheer Shanka
2023-05-15 19:46:14 +00:00
committed by Automerger Merge Worker
parent 59d1129bb6 3e7d7d6398
commit def3c2f65d
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18894,12 +18894,14 @@ public class ActivityManagerService extends IActivityManager.Stub
@Override
public void waitForBroadcastIdle() {
waitForBroadcastIdle(LOG_WRITER_INFO);
waitForBroadcastIdle(LOG_WRITER_INFO, false);
}
public void waitForBroadcastIdle(@NonNull PrintWriter pw) {
void waitForBroadcastIdle(@NonNull PrintWriter pw, boolean flushBroadcastLoopers) {
enforceCallingPermission(permission.DUMP, "waitForBroadcastIdle()");
BroadcastLoopers.waitForIdle(pw);
if (flushBroadcastLoopers) {
BroadcastLoopers.waitForIdle(pw);
}
for (BroadcastQueue queue : mBroadcastQueues) {
queue.waitForIdle(pw);
}
@@ -18912,7 +18914,7 @@ public class ActivityManagerService extends IActivityManager.Stub
waitForBroadcastBarrier(LOG_WRITER_INFO, false, false);
}
public void waitForBroadcastBarrier(@NonNull PrintWriter pw,
void waitForBroadcastBarrier(@NonNull PrintWriter pw,
boolean flushBroadcastLoopers, boolean flushApplicationThreads) {
enforceCallingPermission(permission.DUMP, "waitForBroadcastBarrier()");
if (flushBroadcastLoopers) {
@@ -18930,7 +18932,7 @@ public class ActivityManagerService extends IActivityManager.Stub
* Wait for all pending {@link IApplicationThread} events to be processed in
* all currently running apps.
*/
public void waitForApplicationBarrier(@NonNull PrintWriter pw) {
void waitForApplicationBarrier(@NonNull PrintWriter pw) {
final CountDownLatch finishedLatch = new CountDownLatch(1);
final AtomicInteger pingCount = new AtomicInteger(0);
final AtomicInteger pongCount = new AtomicInteger(0);

12
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -3447,7 +3447,17 @@ final class ActivityManagerShellCommand extends ShellCommand {
int runWaitForBroadcastIdle(PrintWriter pw) throws RemoteException {
pw = new PrintWriter(new TeeWriter(LOG_WRITER_INFO, pw));
mInternal.waitForBroadcastIdle(pw);
boolean flushBroadcastLoopers = false;
String opt;
while ((opt = getNextOption()) != null) {
if (opt.equals("--flush-broadcast-loopers")) {
flushBroadcastLoopers = true;
} else {
getErrPrintWriter().println("Error: Unknown option: " + opt);
return -1;
}
}
mInternal.waitForBroadcastIdle(pw, flushBroadcastLoopers);
return 0;
}