Merge "Sync settingslib/datastore library" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
c9433c2d52
@@ -164,7 +164,7 @@ public class BatteryOptimizeUtilsTest {
|
|||||||
TimeUnit.SECONDS.sleep(1);
|
TimeUnit.SECONDS.sleep(1);
|
||||||
|
|
||||||
verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
|
verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
|
||||||
verify(mObserver).onChanged(DataChangeReason.UPDATE);
|
verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -178,7 +178,7 @@ public class BatteryOptimizeUtilsTest {
|
|||||||
TimeUnit.SECONDS.sleep(1);
|
TimeUnit.SECONDS.sleep(1);
|
||||||
|
|
||||||
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
|
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
|
||||||
verify(mObserver).onChanged(DataChangeReason.UPDATE);
|
verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -192,7 +192,7 @@ public class BatteryOptimizeUtilsTest {
|
|||||||
TimeUnit.SECONDS.sleep(1);
|
TimeUnit.SECONDS.sleep(1);
|
||||||
|
|
||||||
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
|
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
|
||||||
verify(mObserver).onChanged(DataChangeReason.UPDATE);
|
verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -301,7 +301,7 @@ public class BatteryOptimizeUtilsTest {
|
|||||||
inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID);
|
inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID);
|
||||||
inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME);
|
inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME);
|
||||||
verifyNoMoreInteractions(mMockBackend);
|
verifyNoMoreInteractions(mMockBackend);
|
||||||
verify(mObserver).onChanged(DataChangeReason.DELETE);
|
verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -312,7 +312,7 @@ public class BatteryOptimizeUtilsTest {
|
|||||||
/* isSystemOrDefaultApp */ false);
|
/* isSystemOrDefaultApp */ false);
|
||||||
|
|
||||||
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
|
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
|
||||||
verify(mObserver).onChanged(DataChangeReason.DELETE);
|
verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -323,7 +323,7 @@ public class BatteryOptimizeUtilsTest {
|
|||||||
/* isSystemOrDefaultApp */ false);
|
/* isSystemOrDefaultApp */ false);
|
||||||
|
|
||||||
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
|
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
|
||||||
verify(mObserver).onChanged(DataChangeReason.DELETE);
|
verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void runTestForResetWithMode(
|
private void runTestForResetWithMode(
|
||||||
|
Reference in New Issue
Block a user