| commit | 9b51e9f7b28ce31c22db8d04dbd3075b9226a618 | [log] [tgz] |
|---|---|---|
| author | Liana Kazanova <lkazanova@google.com> | Fri Oct 27 21:12:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 27 21:12:53 2023 +0000 |
| tree | f471f9ecbc7bf4c74a6549e5c22965cc08cd519b | |
| parent | ba9bcd9f8a2667a966754167fb90a8e84b364e5f [diff] | |
| parent | bd581b088c80358cea848e50c88f02d1d49740ea [diff] |
Merge "Ignore flaky test" into udc-dev am: bd581b088c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25177502 Change-Id: Ib9f6931bb547b7cd67a12429d75129d745f333a6 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 0b13f9a..5f84e9e 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
@@ -30,6 +30,7 @@ import android.provider.Settings.Global; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; +import android.test.suitebuilder.annotation.Suppress; import android.util.ArrayMap; import com.android.frameworks.servicestests.R; @@ -115,6 +116,7 @@ testServiceDefaultValue_On(ServiceType.NULL); } + @Suppress @SmallTest public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() { testServiceDefaultValue_Off(ServiceType.VIBRATION); @@ -200,6 +202,7 @@ testServiceDefaultValue_On(ServiceType.QUICK_DOZE); } + @Suppress @SmallTest public void testUpdateConstants_getCorrectData() { mBatterySaverPolicy.updateConstantsLocked(BATTERY_SAVER_CONSTANTS, "");