diff --git a/core/api/current.txt b/core/api/current.txt index 8710e613602f6..8e91ddb3a4bcb 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -30431,19 +30431,10 @@ package android.os { public abstract class CombinedVibrationEffect implements android.os.Parcelable { method @NonNull public static android.os.CombinedVibrationEffect createSynced(@NonNull android.os.VibrationEffect); method public int describeContents(); - method @NonNull public static android.os.CombinedVibrationEffect.SequentialCombination startSequential(); method @NonNull public static android.os.CombinedVibrationEffect.SyncedCombination startSynced(); field @NonNull public static final android.os.Parcelable.Creator CREATOR; } - public static final class CombinedVibrationEffect.SequentialCombination { - method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect); - method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect, int); - method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect); - method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect, int); - method @NonNull public android.os.CombinedVibrationEffect combine(); - } - public static final class CombinedVibrationEffect.SyncedCombination { method @NonNull public android.os.CombinedVibrationEffect.SyncedCombination addVibrator(int, @NonNull android.os.VibrationEffect); method @NonNull public android.os.CombinedVibrationEffect combine(); diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 29ea74e212726..e4757e6204b76 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1489,6 +1489,7 @@ package android.os { public abstract class CombinedVibrationEffect implements android.os.Parcelable { method public abstract long getDuration(); + method @NonNull public static android.os.CombinedVibrationEffect.SequentialCombination startSequential(); } public static final class CombinedVibrationEffect.Mono extends android.os.CombinedVibrationEffect { @@ -1506,6 +1507,14 @@ package android.os { field @NonNull public static final android.os.Parcelable.Creator CREATOR; } + public static final class CombinedVibrationEffect.SequentialCombination { + method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect); + method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(int, @NonNull android.os.VibrationEffect, int); + method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect); + method @NonNull public android.os.CombinedVibrationEffect.SequentialCombination addNext(@NonNull android.os.CombinedVibrationEffect, int); + method @NonNull public android.os.CombinedVibrationEffect combine(); + } + public static final class CombinedVibrationEffect.Stereo extends android.os.CombinedVibrationEffect { method public long getDuration(); method @NonNull public android.util.SparseArray getEffects(); diff --git a/core/java/android/os/CombinedVibrationEffect.java b/core/java/android/os/CombinedVibrationEffect.java index c8e682c86ea7e..e068772e954a8 100644 --- a/core/java/android/os/CombinedVibrationEffect.java +++ b/core/java/android/os/CombinedVibrationEffect.java @@ -76,7 +76,9 @@ public abstract class CombinedVibrationEffect implements Parcelable { * A sequential vibration effect should be performed by multiple vibrators in order. * * @see CombinedVibrationEffect.SequentialCombination + * @hide */ + @TestApi @NonNull public static SequentialCombination startSequential() { return new SequentialCombination(); @@ -162,7 +164,9 @@ public abstract class CombinedVibrationEffect implements Parcelable { * A combination of haptic effects that should be played in multiple vibrators in sequence. * * @see CombinedVibrationEffect#startSequential() + * @hide */ + @TestApi public static final class SequentialCombination { private final ArrayList mEffects = new ArrayList<>();