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

Commit c9433c2d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sync settingslib/datastore library" into main

parents 012f244c 5164cd8c
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public class BatteryOptimizeUtilsTest {
        TimeUnit.SECONDS.sleep(1);

        verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
        verify(mObserver).onChanged(DataChangeReason.UPDATE);
        verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
    }

    @Test
@@ -178,7 +178,7 @@ public class BatteryOptimizeUtilsTest {
        TimeUnit.SECONDS.sleep(1);

        verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
        verify(mObserver).onChanged(DataChangeReason.UPDATE);
        verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
    }

    @Test
@@ -192,7 +192,7 @@ public class BatteryOptimizeUtilsTest {
        TimeUnit.SECONDS.sleep(1);

        verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
        verify(mObserver).onChanged(DataChangeReason.UPDATE);
        verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
    }

    @Test
@@ -301,7 +301,7 @@ public class BatteryOptimizeUtilsTest {
        inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID);
        inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME);
        verifyNoMoreInteractions(mMockBackend);
        verify(mObserver).onChanged(DataChangeReason.DELETE);
        verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
    }

    @Test
@@ -312,7 +312,7 @@ public class BatteryOptimizeUtilsTest {
                /* isSystemOrDefaultApp */ false);

        verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
        verify(mObserver).onChanged(DataChangeReason.DELETE);
        verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
    }

    @Test
@@ -323,7 +323,7 @@ public class BatteryOptimizeUtilsTest {
                /* isSystemOrDefaultApp */ false);

        verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
        verify(mObserver).onChanged(DataChangeReason.DELETE);
        verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
    }

    private void runTestForResetWithMode(