Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev (170e3e24) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -23620,7 +23620,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();
		@@ -23646,7 +23646,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);
		}

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -25457,7 +25457,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();
		@@ -25483,7 +25483,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);
		}

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -23733,7 +23733,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();
		@@ -23759,7 +23759,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);
		}

media/java/android/media/VolumeShaper.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -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();
		* </pre>
		* <p>
		@@ -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.
		* <p>
		* The time scale is set by {@link #setDurationMs}.
		* The time scale is set by {@link #setDurationMillis}.
		* <p>
		* @param times an array of float values representing
		* the time line of the volume curve.

services/core/java/com/android/server/audio/PlaybackActivityMonitor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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()))