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

Merge "Remove dumpstate error race condition" am: 5c67510b4f am: 8f01336f0d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I221ac8d6327121805d2309234d12286dda6f9858
This commit is contained in:
Gavin Corkery
2021-01-22 17:16:44 +00:00
committed by Automerger Merge Worker
parent e10a7b9910 8f01336f0d
commit f85308beef
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/tests/bugreports/src/com/android/os/bugreports/tests/BugreportManagerTest.java
View File

@@ -76,6 +76,12 @@ public class BugreportManagerTest {
private static final long DUMPSTATE_STARTUP_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10); private static final long DUMPSTATE_STARTUP_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10);
private static final long UIAUTOMATOR_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10); private static final long UIAUTOMATOR_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10);
// A small timeout used when waiting for the result of a BugreportCallback to be received.
// This value must be at least 1000ms since there is an intentional delay in
// BugreportManagerServiceImpl in the error case.
private static final long CALLBACK_RESULT_TIMEOUT_MS = 1500;
// Sent by Shell when its bugreport finishes (contains final bugreport/screenshot file name // Sent by Shell when its bugreport finishes (contains final bugreport/screenshot file name
// associated with the bugreport). // associated with the bugreport).
private static final String INTENT_BUGREPORT_FINISHED = private static final String INTENT_BUGREPORT_FINISHED =
@@ -185,7 +191,7 @@ public class BugreportManagerTest {
ParcelFileDescriptor bugreportFd2 = parcelFd(bugreportFile2); ParcelFileDescriptor bugreportFd2 = parcelFd(bugreportFile2);
ParcelFileDescriptor screenshotFd2 = parcelFd(screenshotFile2); ParcelFileDescriptor screenshotFd2 = parcelFd(screenshotFile2);
mBrm.startBugreport(bugreportFd2, screenshotFd2, wifi(), mExecutor, callback2); mBrm.startBugreport(bugreportFd2, screenshotFd2, wifi(), mExecutor, callback2);
Thread.sleep(500 /* .5s */); Thread.sleep(CALLBACK_RESULT_TIMEOUT_MS);
// Verify #2 encounters an error. // Verify #2 encounters an error.
assertThat(callback2.getErrorCode()).isEqualTo( assertThat(callback2.getErrorCode()).isEqualTo(
@@ -194,7 +200,7 @@ public class BugreportManagerTest {
// Cancel #1 so we can move on to the next test. // Cancel #1 so we can move on to the next test.
mBrm.cancelBugreport(); mBrm.cancelBugreport();
Thread.sleep(500 /* .5s */); waitTillDoneOrTimeout(callback);
assertThat(callback.isDone()).isTrue(); assertThat(callback.isDone()).isTrue();
assertFdsAreClosed(mBugreportFd, mScreenshotFd); assertFdsAreClosed(mBugreportFd, mScreenshotFd);
} }
@@ -220,7 +226,7 @@ public class BugreportManagerTest {
// Try again, with DUMP permission. // Try again, with DUMP permission.
getPermissions(); getPermissions();
mBrm.cancelBugreport(); mBrm.cancelBugreport();
Thread.sleep(500 /* .5s */); waitTillDoneOrTimeout(callback);
assertThat(callback.isDone()).isTrue(); assertThat(callback.isDone()).isTrue();
assertFdsAreClosed(mBugreportFd, mScreenshotFd); assertFdsAreClosed(mBugreportFd, mScreenshotFd);
} }

7
services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
View File

@@ -336,6 +336,13 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub {
@Override @Override
public void binderDied() { public void binderDied() {
try {
// Allow a small amount of time for any error or finished callbacks to be made.
// This ensures that the listener does not receive an erroneous runtime error
// callback.
Thread.sleep(1000);
} catch (InterruptedException ignored) {
}
synchronized (mLock) { synchronized (mLock) {
if (!mDone) { if (!mDone) {
// If we have not gotten a "done" callback this must be a crash. // If we have not gotten a "done" callback this must be a crash.