Merge "Ringtone: unhide looping and volume control" (2175b9a8) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25212,10 +25212,14 @@ package android.media {
	method public android.media.AudioAttributes getAudioAttributes();		method public android.media.AudioAttributes getAudioAttributes();
	method public deprecated int getStreamType();		method public deprecated int getStreamType();
	method public java.lang.String getTitle(android.content.Context);		method public java.lang.String getTitle(android.content.Context);
			method public float getVolume();
			method public boolean isLooping();
	method public boolean isPlaying();		method public boolean isPlaying();
	method public void play();		method public void play();
	method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;		method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
			method public void setLooping(boolean);
	method public deprecated void setStreamType(int);		method public deprecated void setStreamType(int);
			method public void setVolume(float);
	method public void stop();		method public void stop();
	}		}

config/hiddenapi-light-greylist.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -976,8 +976,6 @@ Landroid/media/RemoteDisplay;->notifyDisplayConnected(Landroid/view/Surface;IIII
	Landroid/media/RemoteDisplay;->notifyDisplayDisconnected()V		Landroid/media/RemoteDisplay;->notifyDisplayDisconnected()V
	Landroid/media/RemoteDisplay;->notifyDisplayError(I)V		Landroid/media/RemoteDisplay;->notifyDisplayError(I)V
	Landroid/media/RingtoneManager;->getRingtone(Landroid/content/Context;Landroid/net/Uri;I)Landroid/media/Ringtone;		Landroid/media/RingtoneManager;->getRingtone(Landroid/content/Context;Landroid/net/Uri;I)Landroid/media/Ringtone;
	Landroid/media/Ringtone;->setLooping(Z)V
	Landroid/media/Ringtone;->setVolume(F)V
	Landroid/media/session/MediaSessionLegacyHelper;->getHelper(Landroid/content/Context;)Landroid/media/session/MediaSessionLegacyHelper;		Landroid/media/session/MediaSessionLegacyHelper;->getHelper(Landroid/content/Context;)Landroid/media/session/MediaSessionLegacyHelper;
	Landroid/media/SubtitleController;->mHandler:Landroid/os/Handler;		Landroid/media/SubtitleController;->mHandler:Landroid/os/Handler;
	Landroid/media/ThumbnailUtils;->createImageThumbnail(Ljava/lang/String;I)Landroid/graphics/Bitmap;		Landroid/media/ThumbnailUtils;->createImageThumbnail(Ljava/lang/String;I)Landroid/graphics/Bitmap;

media/java/android/media/Ringtone.java

+28 −11

Original line number	Original line	Diff line number	Diff line
	@@ -146,9 +146,8 @@ public class Ringtone {
	}		}

	/**		/**
	* @hide
	* Sets the player to be looping or non-looping.		* Sets the player to be looping or non-looping.
	* @param looping whether to loop or not		* @param looping whether to loop or not.
	*/		*/
	public void setLooping(boolean looping) {		public void setLooping(boolean looping) {
	synchronized (mPlaybackSettingsLock) {		synchronized (mPlaybackSettingsLock) {
	@@ -158,7 +157,16 @@ public class Ringtone {
	}		}

	/**		/**
	* @hide		* Returns whether the looping mode was enabled on this player.
			* @return true if this player loops when playing.
			*/
			public boolean isLooping() {
			synchronized (mPlaybackSettingsLock) {
			return mIsLooping;
			}
			}

			/**
	* Sets the volume on this player.		* Sets the volume on this player.
	* @param volume a raw scalar in range 0.0 to 1.0, where 0.0 mutes this player, and 1.0		* @param volume a raw scalar in range 0.0 to 1.0, where 0.0 mutes this player, and 1.0
	* corresponds to no attenuation being applied.		* corresponds to no attenuation being applied.
	@@ -172,6 +180,16 @@ public class Ringtone {
	}		}
	}		}

			/**
			* Returns the volume scalar set on this player.
			* @return a value between 0.0f and 1.0f.
			*/
			public float getVolume() {
			synchronized (mPlaybackSettingsLock) {
			return mVolume;
			}
			}

	/**		/**
	* Must be called synchronized on mPlaybackSettingsLock		* Must be called synchronized on mPlaybackSettingsLock
	*/		*/
	@@ -265,7 +283,6 @@ public class Ringtone {

	if (title == null) {		if (title == null) {
	title = context.getString(com.android.internal.R.string.ringtone_unknown);		title = context.getString(com.android.internal.R.string.ringtone_unknown);

	if (title == null) {		if (title == null) {
	title = "";		title = "";
	}		}