From 0dfbd1569dcf451abfa9ea59a9c478b4cd2d90d2 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 11 Apr 2017 18:52:43 -0700 Subject: VolumeShaper: update API, use "Millis" instead of "Ms" Test: make Bug: 36785428 Change-Id: Ib77ff448bb8454453b1bd39f1491b0189b4ff15b --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- media/java/android/media/VolumeShaper.java | 28 +++++++++++----------- .../server/audio/PlaybackActivityMonitor.java | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api/current.txt b/api/current.txt index 0fce31cdf68a..5dbdd1030d82 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23666,7 +23666,7 @@ package android.media { public static final class VolumeShaper.Configuration implements android.os.Parcelable { method public int describeContents(); - method public double getDurationMs(); + method public double getDurationMillis(); method public int getInterpolatorType(); method public static int getMaximumCurvePoints(); method public float[] getTimes(); @@ -23692,7 +23692,7 @@ package android.media { method public android.media.VolumeShaper.Configuration.Builder scaleToEndVolume(float); method public android.media.VolumeShaper.Configuration.Builder scaleToStartVolume(float); method public android.media.VolumeShaper.Configuration.Builder setCurve(float[], float[]); - method public android.media.VolumeShaper.Configuration.Builder setDurationMs(double); + method public android.media.VolumeShaper.Configuration.Builder setDurationMillis(double); method public android.media.VolumeShaper.Configuration.Builder setInterpolatorType(int); } diff --git a/api/system-current.txt b/api/system-current.txt index f2d9c9cca298..33e6542a5dee 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25502,7 +25502,7 @@ package android.media { public static final class VolumeShaper.Configuration implements android.os.Parcelable { method public int describeContents(); - method public double getDurationMs(); + method public double getDurationMillis(); method public int getInterpolatorType(); method public static int getMaximumCurvePoints(); method public float[] getTimes(); @@ -25528,7 +25528,7 @@ package android.media { method public android.media.VolumeShaper.Configuration.Builder scaleToEndVolume(float); method public android.media.VolumeShaper.Configuration.Builder scaleToStartVolume(float); method public android.media.VolumeShaper.Configuration.Builder setCurve(float[], float[]); - method public android.media.VolumeShaper.Configuration.Builder setDurationMs(double); + method public android.media.VolumeShaper.Configuration.Builder setDurationMillis(double); method public android.media.VolumeShaper.Configuration.Builder setInterpolatorType(int); } diff --git a/api/test-current.txt b/api/test-current.txt index d0e0c91410b7..f187faa39ac5 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -23779,7 +23779,7 @@ package android.media { public static final class VolumeShaper.Configuration implements android.os.Parcelable { method public int describeContents(); - method public double getDurationMs(); + method public double getDurationMillis(); method public int getInterpolatorType(); method public static int getMaximumCurvePoints(); method public float[] getTimes(); @@ -23805,7 +23805,7 @@ package android.media { method public android.media.VolumeShaper.Configuration.Builder scaleToEndVolume(float); method public android.media.VolumeShaper.Configuration.Builder scaleToStartVolume(float); method public android.media.VolumeShaper.Configuration.Builder setCurve(float[], float[]); - method public android.media.VolumeShaper.Configuration.Builder setDurationMs(double); + method public android.media.VolumeShaper.Configuration.Builder setDurationMillis(double); method public android.media.VolumeShaper.Configuration.Builder setInterpolatorType(int); } diff --git a/media/java/android/media/VolumeShaper.java b/media/java/android/media/VolumeShaper.java index af11e07d2f98..1dda6a4c77f7 100644 --- a/media/java/android/media/VolumeShaper.java +++ b/media/java/android/media/VolumeShaper.java @@ -301,7 +301,7 @@ public final class VolumeShaper implements AutoCloseable { .setInterpolatorType(INTERPOLATOR_TYPE_LINEAR) .setCurve(new float[] {0.f, 1.f} /* times */, new float[] {0.f, 1.f} /* volumes */) - .setDurationMs(1000.) + .setDurationMillis(1000.) .build(); /** @@ -314,7 +314,7 @@ public final class VolumeShaper implements AutoCloseable { .setInterpolatorType(INTERPOLATOR_TYPE_CUBIC) .setCurve(new float[] {0.f, 1.f} /* times */, new float[] {0.f, 1.f} /* volumes */) - .setDurationMs(1000.) + .setDurationMillis(1000.) .build(); /** @@ -348,12 +348,12 @@ public final class VolumeShaper implements AutoCloseable { SINE_RAMP = new VolumeShaper.Configuration.Builder() .setInterpolatorType(INTERPOLATOR_TYPE_CUBIC) .setCurve(times, sines) - .setDurationMs(1000.) + .setDurationMillis(1000.) .build(); SCURVE_RAMP = new VolumeShaper.Configuration.Builder() .setInterpolatorType(INTERPOLATOR_TYPE_CUBIC) .setCurve(times, scurve) - .setDurationMs(1000.) + .setDurationMillis(1000.) .build(); } @@ -569,7 +569,7 @@ public final class VolumeShaper implements AutoCloseable { /** * Returns the duration of the volume shape in milliseconds. */ - public double getDurationMs() { + public double getDurationMillis() { return mDurationMs; } @@ -700,7 +700,7 @@ public final class VolumeShaper implements AutoCloseable { * .setInterpolatorType(VolumeShaper.Configuration.INTERPOLATOR_TYPE_LINEAR) * .setCurve(new float[] { 0.f, 1.f }, // times * new float[] { 0.f, 1.f }) // volumes - * .setDurationMs(1000.) + * .setDurationMillis(1000.) * .build(); * *

@@ -731,7 +731,7 @@ public final class VolumeShaper implements AutoCloseable { mId = configuration.getId(); mOptionFlags = configuration.getAllOptionFlags(); mInterpolatorType = configuration.getInterpolatorType(); - mDurationMs = configuration.getDurationMs(); + mDurationMs = configuration.getDurationMillis(); mTimes = configuration.getTimes().clone(); mVolumes = configuration.getVolumes().clone(); } @@ -805,17 +805,17 @@ public final class VolumeShaper implements AutoCloseable { * * If omitted, the default duration is 1 second. * - * @param durationMs + * @param durationMillis * @return the same {@code Builder} instance. - * @throws IllegalArgumentException if {@code durationMs} + * @throws IllegalArgumentException if {@code durationMillis} * is not strictly positive. */ - public @NonNull Builder setDurationMs(double durationMs) { - if (durationMs <= 0.) { + public @NonNull Builder setDurationMillis(double durationMillis) { + if (durationMillis <= 0.) { throw new IllegalArgumentException( - "duration: " + durationMs + " not positive"); + "duration: " + durationMillis + " not positive"); } - mDurationMs = durationMs; + mDurationMs = durationMillis; return this; } @@ -833,7 +833,7 @@ public final class VolumeShaper implements AutoCloseable { * time (x) coordinates should be monotonically increasing, from 0.f to 1.f; * volume (y) coordinates must be within 0.f to 1.f. *

- * The time scale is set by {@link #setDurationMs}. + * The time scale is set by {@link #setDurationMillis}. *

* @param times an array of float values representing * the time line of the volume curve. diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index 51aa4f8a834a..9eda9294031e 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -57,7 +57,7 @@ public final class PlaybackActivityMonitor .setCurve(new float[] { 0.f, 1.f } /* times */, new float[] { 1.f, 0.2f } /* volumes */) .setOptionFlags(VolumeShaper.Configuration.OPTION_FLAG_CLOCK_TIME) - .setDurationMs(MediaFocusControl.getFocusRampTimeMs( + .setDurationMillis(MediaFocusControl.getFocusRampTimeMs( AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION) .build())) -- cgit v1.2.3-59-g8ed1b