Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcc89ba0 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: If226c8609e1dd6b8168c20b034a5a27f19deb8a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1931c840 e1cdd8d2

services/core/java/com/android/server/pm/BackgroundDexOptService.java

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ public final class BackgroundDexOptService { 
                                job.jobFinished(params, !completed);

                            } else {

                                // Periodic job

                                job.jobFinished(params, true);

                                job.jobFinished(params, false /* reschedule */);

                            }

                            markDexOptCompleted();

                        }

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

+5 −5
Original line number Diff line number Diff line
@@ -221,7 +221,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);

    }
@@ -239,7 +239,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);
@@ -254,7 +254,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();
@@ -391,7 +391,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);

    }
@@ -419,7 +419,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);

    }