Merge "frameworks/base: Fix comments in RingtoneManager" (2923c9ef) · Commits · e / os / android_frameworks_base

media/java/android/media/RingtoneManager.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ public class RingtoneManager {

		/**
		* Given to the ringtone picker as a boolean. Whether to include DRM ringtones.
		* @deprecated DRM ringtones are no longer supported
		*/
		public static final String EXTRA_RINGTONE_INCLUDE_DRM =
		"android.intent.extra.ringtone.INCLUDE_DRM";
		@@ -331,8 +330,6 @@ public class RingtoneManager {
		*
		* @return Whether DRM ringtones will be included.
		* @see #setIncludeDrm(boolean)
		* Obsolete - always returns false
		* @deprecated DRM ringtones are no longer supported
		*/
		public boolean getIncludeDrm() {
		return mIncludeDrm;
		@@ -342,8 +339,6 @@ public class RingtoneManager {
		* Sets whether to include DRM ringtones.
		*
		* @param includeDrm Whether to include DRM ringtones.
		* Obsolete - no longer has any effect
		* @deprecated DRM ringtones are no longer supported
		*/
		public void setIncludeDrm(boolean includeDrm) {
		mIncludeDrm = includeDrm;