Merge "AudioAttributes notification deprecation: fix javadoc order" (616c2cac) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioAttributes.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -139,26 +139,26 @@ public final class AudioAttributes implements Parcelable {
		*/
		public final static int USAGE_NOTIFICATION_RINGTONE = 6;
		/**
		* @deprecated Use {@link #USAGE_NOTIFICATION} which is handled
		* the same way as this usage by the audio framework
		* Usage value to use when the usage is a request to enter/end a
		* communication, such as a VoIP communication or video-conference.
		* @deprecated Use {@link #USAGE_NOTIFICATION} which is handled
		* the same way as this usage by the audio framework
		*/
		@Deprecated
		public final static int USAGE_NOTIFICATION_COMMUNICATION_REQUEST = 7;
		/**
		* @deprecated Use {@link #USAGE_NOTIFICATION} which is handled
		* the same way as this usage by the audio framework
		* Usage value to use when the usage is notification for an "instant"
		* communication such as a chat, or SMS.
		* @deprecated Use {@link #USAGE_NOTIFICATION} which is handled
		* the same way as this usage by the audio framework
		*/
		@Deprecated
		public final static int USAGE_NOTIFICATION_COMMUNICATION_INSTANT = 8;
		/**
		* @deprecated Use {@link #USAGE_NOTIFICATION} which is handled
		* the same way as this usage by the audio framework
		* Usage value to use when the usage is notification for a
		* non-immediate type of communication such as e-mail.
		* @deprecated Use {@link #USAGE_NOTIFICATION} which is handled
		* the same way as this usage by the audio framework
		*/
		@Deprecated
		public final static int USAGE_NOTIFICATION_COMMUNICATION_DELAYED = 9;