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

Merge "Fix the scheduling of the background dexopt job." into tm-qpr-dev am: e1cdd8d243 am: dcc89ba0b3

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

Change-Id: I48a1b2ed3097167b11b0dc206165066dbf50b8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiakai Zhang
2022-10-31 14:59:48 +00:00
committed by Automerger Merge Worker
parent 0f6b66aa53 dcc89ba0b3
commit b10fc798c4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/BackgroundDexOptService.java
View File

@@ -410,7 +410,7 @@ public final class BackgroundDexOptService {
job.jobFinished(params, !completed);
} else {
// Periodic job
job.jobFinished(params, true);
job.jobFinished(params, false /* reschedule */);
}
markDexOptCompleted();
}

10
services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java
View File

@@ -223,7 +223,7 @@ public final class BackgroundDexOptServiceUnitTest {
/* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK,
/* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ null);
runFullJob(mJobServiceForIdle, mJobParametersForIdle,
/* expectedReschedule= */ true, /* expectedStatus= */ STATUS_OK,
/* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK,
/* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ null);
}
@@ -241,7 +241,7 @@ public final class BackgroundDexOptServiceUnitTest {
assertThat(getFailedPackageNamesSecondary()).isEmpty();
runFullJob(mJobServiceForIdle, mJobParametersForIdle,
/* expectedReschedule= */ true, /* expectedStatus= */ STATUS_OK,
/* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK,
/* totalJobFinishedWithParams= */ 1, /* expectedSkippedPackage= */ PACKAGE_AAA);
assertThat(getFailedPackageNamesPrimary()).containsExactly(PACKAGE_AAA);
@@ -256,7 +256,7 @@ public final class BackgroundDexOptServiceUnitTest {
mDexOptResultForPackageAAA = PackageDexOptimizer.DEX_OPT_PERFORMED;
runFullJob(mJobServiceForIdle, mJobParametersForIdle,
/* expectedReschedule= */ true, /* expectedStatus= */ STATUS_OK,
/* expectedReschedule= */ false, /* expectedStatus= */ STATUS_OK,
/* totalJobFinishedWithParams= */ 2, /* expectedSkippedPackage= */ null);
assertThat(getFailedPackageNamesPrimary()).isEmpty();
@@ -393,7 +393,7 @@ public final class BackgroundDexOptServiceUnitTest {
mCancelThread.join(TEST_WAIT_TIMEOUT_MS);
// Always reschedule for periodic job
verify(mJobServiceForIdle).jobFinished(mJobParametersForIdle, true);
verify(mJobServiceForIdle).jobFinished(mJobParametersForIdle, false);
verifyLastControlDexOptBlockingCall(false);
}
@@ -421,7 +421,7 @@ public final class BackgroundDexOptServiceUnitTest {
mCancelThread.join(TEST_WAIT_TIMEOUT_MS);
// Always reschedule for periodic job
verify(mJobServiceForIdle).jobFinished(mJobParametersForIdle, true);
verify(mJobServiceForIdle).jobFinished(mJobParametersForIdle, false);
verify(mDexOptHelper, never()).controlDexOptBlocking(true);
}