| commit | 7c0f290aea3c7f3e5f36cdd5f1c899968b7ad65c | [log] [tgz] |
|---|---|---|
| author | Pechetty Sravani <pechetty@google.com> | Fri Dec 29 07:50:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 29 07:50:41 2023 +0000 |
| tree | 764a233c0651c90d3eeb74b52a9b2e42ff8bc231 | |
| parent | cd46817b59049589d61ac64ea16d9fd26b3ea4c7 [diff] | |
| parent | eb5f7f8b4e214f02516c075c5a4d67168133d2e2 [diff] |
Merge "Revert "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: eb5f7f8b4e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25756821 Change-Id: I3a6767265abeb104c37a726a841ec4cc8250d612 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java index 29e3d58..3102639 100644 --- a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java +++ b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java
@@ -116,7 +116,7 @@ testServiceDefaultValue_On(ServiceType.NULL); } - @Suppress // TODO: b/317823111 - Remove once test fixed. + @Suppress @SmallTest public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() { testServiceDefaultValue_On(ServiceType.VIBRATION); @@ -202,7 +202,7 @@ testServiceDefaultValue_On(ServiceType.QUICK_DOZE); } - @Suppress // TODO: b/317823111 - Remove once test fixed. + @Suppress @SmallTest public void testUpdateConstants_getCorrectData() { mBatterySaverPolicy.updateConstantsLocked(BATTERY_SAVER_CONSTANTS, ""); @@ -302,7 +302,6 @@ } } - @Suppress // TODO: b/317823111 - Remove once test fixed. public void testSetPolicyLevel_Adaptive() { mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_ADAPTIVE);