Commit 3b8b2f70 by olly Committed by Christos Tsilopoulos

Remove C.StreamType constant that's not a real stream type

#minor-release

PiperOrigin-RevId: 341833274
parent 6f7c97a7
...@@ -254,8 +254,7 @@ public final class C { ...@@ -254,8 +254,7 @@ public final class C {
/** /**
* Stream types for an {@link android.media.AudioTrack}. One of {@link #STREAM_TYPE_ALARM}, {@link * Stream types for an {@link android.media.AudioTrack}. One of {@link #STREAM_TYPE_ALARM}, {@link
* #STREAM_TYPE_DTMF}, {@link #STREAM_TYPE_MUSIC}, {@link #STREAM_TYPE_NOTIFICATION}, {@link * #STREAM_TYPE_DTMF}, {@link #STREAM_TYPE_MUSIC}, {@link #STREAM_TYPE_NOTIFICATION}, {@link
* #STREAM_TYPE_RING}, {@link #STREAM_TYPE_SYSTEM}, {@link #STREAM_TYPE_VOICE_CALL} or {@link * #STREAM_TYPE_RING}, {@link #STREAM_TYPE_SYSTEM} or {@link #STREAM_TYPE_VOICE_CALL}.
* #STREAM_TYPE_USE_DEFAULT}.
*/ */
@Documented @Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
...@@ -266,8 +265,7 @@ public final class C { ...@@ -266,8 +265,7 @@ public final class C {
STREAM_TYPE_NOTIFICATION, STREAM_TYPE_NOTIFICATION,
STREAM_TYPE_RING, STREAM_TYPE_RING,
STREAM_TYPE_SYSTEM, STREAM_TYPE_SYSTEM,
STREAM_TYPE_VOICE_CALL, STREAM_TYPE_VOICE_CALL
STREAM_TYPE_USE_DEFAULT
}) })
public @interface StreamType {} public @interface StreamType {}
/** /**
...@@ -298,13 +296,7 @@ public final class C { ...@@ -298,13 +296,7 @@ public final class C {
* @see AudioManager#STREAM_VOICE_CALL * @see AudioManager#STREAM_VOICE_CALL
*/ */
public static final int STREAM_TYPE_VOICE_CALL = AudioManager.STREAM_VOICE_CALL; public static final int STREAM_TYPE_VOICE_CALL = AudioManager.STREAM_VOICE_CALL;
/** /** The default stream type used by audio renderers. Equal to {@link #STREAM_TYPE_MUSIC}. */
* @see AudioManager#USE_DEFAULT_STREAM_TYPE
*/
public static final int STREAM_TYPE_USE_DEFAULT = AudioManager.USE_DEFAULT_STREAM_TYPE;
/**
* The default stream type used by audio renderers.
*/
public static final int STREAM_TYPE_DEFAULT = STREAM_TYPE_MUSIC; public static final int STREAM_TYPE_DEFAULT = STREAM_TYPE_MUSIC;
/** /**
......
...@@ -1692,7 +1692,6 @@ public final class Util { ...@@ -1692,7 +1692,6 @@ public final class Util {
return C.USAGE_ASSISTANCE_SONIFICATION; return C.USAGE_ASSISTANCE_SONIFICATION;
case C.STREAM_TYPE_VOICE_CALL: case C.STREAM_TYPE_VOICE_CALL:
return C.USAGE_VOICE_COMMUNICATION; return C.USAGE_VOICE_COMMUNICATION;
case C.STREAM_TYPE_USE_DEFAULT:
case C.STREAM_TYPE_MUSIC: case C.STREAM_TYPE_MUSIC:
default: default:
return C.USAGE_MEDIA; return C.USAGE_MEDIA;
...@@ -1713,7 +1712,6 @@ public final class Util { ...@@ -1713,7 +1712,6 @@ public final class Util {
return C.CONTENT_TYPE_SONIFICATION; return C.CONTENT_TYPE_SONIFICATION;
case C.STREAM_TYPE_VOICE_CALL: case C.STREAM_TYPE_VOICE_CALL:
return C.CONTENT_TYPE_SPEECH; return C.CONTENT_TYPE_SPEECH;
case C.STREAM_TYPE_USE_DEFAULT:
case C.STREAM_TYPE_MUSIC: case C.STREAM_TYPE_MUSIC:
default: default:
return C.CONTENT_TYPE_MUSIC; return C.CONTENT_TYPE_MUSIC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment