summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Liana Kazanova <lkazanova@google.com> 2023-10-27 21:39:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-27 21:39:13 +0000
commitdf5a482d48a15a076715c53ca8c3d7341fce89f0 (patch)
tree647ea5a4aa00546734b4f7fded118aee21aa0e7a
parentc06e70e627175828927fe2d372e90a31cec31fb3 (diff)
parentbd581b088c80358cea848e50c88f02d1d49740ea (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: Iaf3fe909fbd0e1f0ce1b86a51d677d796ccdd1a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java3
1 files changed, 3 insertions, 0 deletions
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 aa6ee09e0179..3102639ff148 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.DeviceConfig;
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 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
testServiceDefaultValue_On(ServiceType.NULL);
}
+ @Suppress
@SmallTest
public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() {
testServiceDefaultValue_On(ServiceType.VIBRATION);
@@ -200,6 +202,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
testServiceDefaultValue_On(ServiceType.QUICK_DOZE);
}
+ @Suppress
@SmallTest
public void testUpdateConstants_getCorrectData() {
mBatterySaverPolicy.updateConstantsLocked(BATTERY_SAVER_CONSTANTS, "");