Merge "Rename getVibrationEffectListForTesting to getVibrationEffects" into main
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index cbcc2bc..29b5213 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -2712,7 +2712,7 @@
package android.os.vibrator.persistence {
public class ParsedVibration {
- method @NonNull public java.util.List<android.os.VibrationEffect> getVibrationEffectListForTesting();
+ method @NonNull public java.util.List<android.os.VibrationEffect> getVibrationEffects();
method @Nullable public android.os.VibrationEffect resolve(@NonNull android.os.Vibrator);
}
diff --git a/core/java/android/os/vibrator/persistence/ParsedVibration.java b/core/java/android/os/vibrator/persistence/ParsedVibration.java
index a76f597..ded74ea 100644
--- a/core/java/android/os/vibrator/persistence/ParsedVibration.java
+++ b/core/java/android/os/vibrator/persistence/ParsedVibration.java
@@ -70,7 +70,7 @@
@TestApi
@VisibleForTesting
@NonNull
- public List<VibrationEffect> getVibrationEffectListForTesting() {
+ public List<VibrationEffect> getVibrationEffects() {
return Collections.unmodifiableList(mEffects);
}
diff --git a/core/tests/vibrator/src/android/os/vibrator/persistence/ParsedVibrationTest.java b/core/tests/vibrator/src/android/os/vibrator/persistence/ParsedVibrationTest.java
index 274c25a..94298dc 100644
--- a/core/tests/vibrator/src/android/os/vibrator/persistence/ParsedVibrationTest.java
+++ b/core/tests/vibrator/src/android/os/vibrator/persistence/ParsedVibrationTest.java
@@ -92,18 +92,18 @@
}
@Test
- public void testGetVibrationEffectListForTesting() {
+ public void testGetVibrationEffects() {
ParsedVibration parsedVibration =
new ParsedVibration(List.of(mEffect1, mEffect2, mEffect3));
- assertThat(parsedVibration.getVibrationEffectListForTesting())
+ assertThat(parsedVibration.getVibrationEffects())
.containsExactly(mEffect1, mEffect2, mEffect3)
.inOrder();
parsedVibration = new ParsedVibration(List.of(mEffect1));
- assertThat(parsedVibration.getVibrationEffectListForTesting()).containsExactly(mEffect1);
+ assertThat(parsedVibration.getVibrationEffects()).containsExactly(mEffect1);
parsedVibration = new ParsedVibration(List.of());
- assertThat(parsedVibration.getVibrationEffectListForTesting()).isEmpty();
+ assertThat(parsedVibration.getVibrationEffects()).isEmpty();
}
private Subject assertThatResolution(
diff --git a/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java b/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java
index d73b5cb..2814a5f 100644
--- a/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java
+++ b/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java
@@ -363,8 +363,7 @@
private void assertParseDocumentSucceeds(String xml, int flags, VibrationEffect... effects)
throws Exception {
- assertThat(parseDocument(xml, flags).getVibrationEffectListForTesting())
- .containsExactly(effects);
+ assertThat(parseDocument(xml, flags).getVibrationEffects()).containsExactly(effects);
}
/**
@@ -381,8 +380,7 @@
String tagName = parser.getName();
assertThat(Set.of("vibration", "vibration-select")).contains(tagName);
- assertThat(parseElement(parser, flags).getVibrationEffectListForTesting())
- .containsExactly(effects);
+ assertThat(parseElement(parser, flags).getVibrationEffects()).containsExactly(effects);
assertThat(parser.getEventType()).isEqualTo(XmlPullParser.END_TAG);
assertThat(parser.getName()).isEqualTo(tagName);
}