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

Commit 3d148eee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix RescuePartyTest" into main am: bf6d630f 

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



Change-Id: I9fcf344d9ebb30aa103a6f921c6689b55ff13fc6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54829a72 bf6d630f

services/tests/mockingservicestests/src/com/android/server/RescuePartyTest.java

+12 −0
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@ public class RescuePartyTest { 


    @Test

    public void testBootLoopDetectionWithExecutionForAllRescueLevels() {

        // this is old test where the flag needs to be disabled

        mSetFlagsRule.disableFlags(Flags.FLAG_RECOVERABILITY_DETECTION);



        RescueParty.onSettingsProviderPublished(mMockContext);

        verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver),

                any(Executor.class),
@@ -449,6 +452,9 @@ public class RescuePartyTest { 


    @Test

    public void testNonPersistentAppCrashDetectionWithScopedResets() {

        // this is old test where the flag needs to be disabled

        mSetFlagsRule.disableFlags(Flags.FLAG_RECOVERABILITY_DETECTION);



        RescueParty.onSettingsProviderPublished(mMockContext);

        verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver),

                any(Executor.class),
@@ -506,6 +512,9 @@ public class RescuePartyTest { 


    @Test

    public void testNonDeviceConfigSettingsOnlyResetOncePerLevel() {

        // this is old test where the flag needs to be disabled

        mSetFlagsRule.disableFlags(Flags.FLAG_RECOVERABILITY_DETECTION);



        RescueParty.onSettingsProviderPublished(mMockContext);

        verify(() -> DeviceConfig.setMonitorCallback(eq(mMockContentResolver),

                any(Executor.class),
@@ -879,6 +888,9 @@ public class RescuePartyTest { 


    @Test

    public void testBootLoopLevels() {

        // this is old test where the flag needs to be disabled

        mSetFlagsRule.disableFlags(Flags.FLAG_RECOVERABILITY_DETECTION);



        RescuePartyObserver observer = RescuePartyObserver.getInstance(mMockContext);



        assertEquals(observer.onBootLoop(0), PackageHealthObserverImpact.USER_IMPACT_LEVEL_0);