From f3d93a0f69190737bfca907321c6170a490cdfdb Mon Sep 17 00:00:00 2001 From: Wei Jia Date: Thu, 6 Apr 2017 10:09:05 -0700 Subject: [PATCH] MediaPlayer: hide BufferingParams API Test: compiles Bug: 36280094 Change-Id: I52f3e71fb0e090ac48711bbb8ea7cbdf8db00074 --- api/current.txt | 37 ------------------- api/system-current.txt | 37 ------------------- api/test-current.txt | 37 ------------------- media/java/android/media/BufferingParams.java | 1 + media/java/android/media/MediaPlayer.java | 9 ++--- 5 files changed, 4 insertions(+), 117 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5287984774cc4..dd3840b627efc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -21451,40 +21451,6 @@ package android.media { method public default void onRoutingChanged(android.media.AudioRouting); } - public final class BufferingParams implements android.os.Parcelable { - method public int describeContents(); - method public int getInitialBufferingMode(); - method public int getInitialBufferingWatermarkKB(); - method public int getInitialBufferingWatermarkMs(); - method public int getRebufferingMode(); - method public int getRebufferingWatermarkHighKB(); - method public int getRebufferingWatermarkHighMs(); - method public int getRebufferingWatermarkLowKB(); - method public int getRebufferingWatermarkLowMs(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int BUFFERING_MODE_NONE = 0; // 0x0 - field public static final int BUFFERING_MODE_SIZE_ONLY = 2; // 0x2 - field public static final int BUFFERING_MODE_TIME_ONLY = 1; // 0x1 - field public static final int BUFFERING_MODE_TIME_THEN_SIZE = 3; // 0x3 - field public static final android.os.Parcelable.Creator CREATOR; - } - - public static class BufferingParams.Builder { - ctor public BufferingParams.Builder(); - ctor public BufferingParams.Builder(android.media.BufferingParams); - method public android.media.BufferingParams build(); - method public android.media.BufferingParams.Builder setInitialBufferingMode(int); - method public android.media.BufferingParams.Builder setInitialBufferingWatermarkKB(int); - method public android.media.BufferingParams.Builder setInitialBufferingWatermarkMs(int); - method public android.media.BufferingParams.Builder setRebufferingMode(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkHighKB(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkHighMs(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkLowKB(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkLowMs(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarksKB(int, int); - method public android.media.BufferingParams.Builder setRebufferingWatermarksMs(int, int); - } - public class CamcorderProfile { method public static android.media.CamcorderProfile get(int); method public static android.media.CamcorderProfile get(int, int); @@ -22789,9 +22755,7 @@ package android.media { method public android.media.VolumeShaper createVolumeShaper(android.media.VolumeShaper.Configuration); method public void deselectTrack(int) throws java.lang.IllegalStateException; method public int getAudioSessionId(); - method public android.media.BufferingParams getBufferingParams(); method public int getCurrentPosition(); - method public android.media.BufferingParams getDefaultBufferingParams(); method public android.media.MediaPlayer.DrmInfo getDrmInfo(); method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException; method public int getDuration(); @@ -22822,7 +22786,6 @@ package android.media { method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; method public deprecated void setAudioStreamType(int); method public void setAuxEffectSendLevel(float); - method public void setBufferingParams(android.media.BufferingParams); method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map, java.util.List) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; diff --git a/api/system-current.txt b/api/system-current.txt index bec8d251c26fc..84c50f1124ab0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -23240,40 +23240,6 @@ package android.media { method public default void onRoutingChanged(android.media.AudioRouting); } - public final class BufferingParams implements android.os.Parcelable { - method public int describeContents(); - method public int getInitialBufferingMode(); - method public int getInitialBufferingWatermarkKB(); - method public int getInitialBufferingWatermarkMs(); - method public int getRebufferingMode(); - method public int getRebufferingWatermarkHighKB(); - method public int getRebufferingWatermarkHighMs(); - method public int getRebufferingWatermarkLowKB(); - method public int getRebufferingWatermarkLowMs(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int BUFFERING_MODE_NONE = 0; // 0x0 - field public static final int BUFFERING_MODE_SIZE_ONLY = 2; // 0x2 - field public static final int BUFFERING_MODE_TIME_ONLY = 1; // 0x1 - field public static final int BUFFERING_MODE_TIME_THEN_SIZE = 3; // 0x3 - field public static final android.os.Parcelable.Creator CREATOR; - } - - public static class BufferingParams.Builder { - ctor public BufferingParams.Builder(); - ctor public BufferingParams.Builder(android.media.BufferingParams); - method public android.media.BufferingParams build(); - method public android.media.BufferingParams.Builder setInitialBufferingMode(int); - method public android.media.BufferingParams.Builder setInitialBufferingWatermarkKB(int); - method public android.media.BufferingParams.Builder setInitialBufferingWatermarkMs(int); - method public android.media.BufferingParams.Builder setRebufferingMode(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkHighKB(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkHighMs(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkLowKB(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkLowMs(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarksKB(int, int); - method public android.media.BufferingParams.Builder setRebufferingWatermarksMs(int, int); - } - public class CamcorderProfile { method public static android.media.CamcorderProfile get(int); method public static android.media.CamcorderProfile get(int, int); @@ -24578,9 +24544,7 @@ package android.media { method public android.media.VolumeShaper createVolumeShaper(android.media.VolumeShaper.Configuration); method public void deselectTrack(int) throws java.lang.IllegalStateException; method public int getAudioSessionId(); - method public android.media.BufferingParams getBufferingParams(); method public int getCurrentPosition(); - method public android.media.BufferingParams getDefaultBufferingParams(); method public android.media.MediaPlayer.DrmInfo getDrmInfo(); method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException; method public int getDuration(); @@ -24611,7 +24575,6 @@ package android.media { method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; method public deprecated void setAudioStreamType(int); method public void setAuxEffectSendLevel(float); - method public void setBufferingParams(android.media.BufferingParams); method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map, java.util.List) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; diff --git a/api/test-current.txt b/api/test-current.txt index e9f94d96c96dc..93dd2776698d2 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -21564,40 +21564,6 @@ package android.media { method public default void onRoutingChanged(android.media.AudioRouting); } - public final class BufferingParams implements android.os.Parcelable { - method public int describeContents(); - method public int getInitialBufferingMode(); - method public int getInitialBufferingWatermarkKB(); - method public int getInitialBufferingWatermarkMs(); - method public int getRebufferingMode(); - method public int getRebufferingWatermarkHighKB(); - method public int getRebufferingWatermarkHighMs(); - method public int getRebufferingWatermarkLowKB(); - method public int getRebufferingWatermarkLowMs(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int BUFFERING_MODE_NONE = 0; // 0x0 - field public static final int BUFFERING_MODE_SIZE_ONLY = 2; // 0x2 - field public static final int BUFFERING_MODE_TIME_ONLY = 1; // 0x1 - field public static final int BUFFERING_MODE_TIME_THEN_SIZE = 3; // 0x3 - field public static final android.os.Parcelable.Creator CREATOR; - } - - public static class BufferingParams.Builder { - ctor public BufferingParams.Builder(); - ctor public BufferingParams.Builder(android.media.BufferingParams); - method public android.media.BufferingParams build(); - method public android.media.BufferingParams.Builder setInitialBufferingMode(int); - method public android.media.BufferingParams.Builder setInitialBufferingWatermarkKB(int); - method public android.media.BufferingParams.Builder setInitialBufferingWatermarkMs(int); - method public android.media.BufferingParams.Builder setRebufferingMode(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkHighKB(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkHighMs(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkLowKB(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarkLowMs(int); - method public android.media.BufferingParams.Builder setRebufferingWatermarksKB(int, int); - method public android.media.BufferingParams.Builder setRebufferingWatermarksMs(int, int); - } - public class CamcorderProfile { method public static android.media.CamcorderProfile get(int); method public static android.media.CamcorderProfile get(int, int); @@ -22902,9 +22868,7 @@ package android.media { method public android.media.VolumeShaper createVolumeShaper(android.media.VolumeShaper.Configuration); method public void deselectTrack(int) throws java.lang.IllegalStateException; method public int getAudioSessionId(); - method public android.media.BufferingParams getBufferingParams(); method public int getCurrentPosition(); - method public android.media.BufferingParams getDefaultBufferingParams(); method public android.media.MediaPlayer.DrmInfo getDrmInfo(); method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException; method public int getDuration(); @@ -22935,7 +22899,6 @@ package android.media { method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; method public deprecated void setAudioStreamType(int); method public void setAuxEffectSendLevel(float); - method public void setBufferingParams(android.media.BufferingParams); method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map, java.util.List) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException; diff --git a/media/java/android/media/BufferingParams.java b/media/java/android/media/BufferingParams.java index fdcd6baa7d185..681271b1a6f07 100644 --- a/media/java/android/media/BufferingParams.java +++ b/media/java/android/media/BufferingParams.java @@ -63,6 +63,7 @@ import java.lang.annotation.RetentionPolicy; * * *

Users should use {@link Builder} to change {@link BufferingParams}. + * @hide */ public final class BufferingParams implements Parcelable { /** diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 1ee05b8c3a9a3..e6f3cfbb07d20 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -46,7 +46,6 @@ import android.view.SurfaceHolder; import android.widget.VideoView; import android.graphics.SurfaceTexture; import android.media.AudioManager; -import android.media.BufferingParams; import android.media.MediaDrm; import android.media.MediaFormat; import android.media.MediaMetricsSet; @@ -493,11 +492,6 @@ import java.util.Vector; * {}

* This method can be called in any state and calling it does not change * the object state.

- * setBufferingParams

- * {Initialized, Prepared, Started, Paused, Stopped, PlaybackCompleted, Error}

- * {Idle}

- * This method does not change the object state. - *

* setPlaybackParams

* {Initialized, Prepared, Started, Paused, PlaybackCompleted, Error}

* {Idle, Stopped}

@@ -1529,6 +1523,7 @@ public class MediaPlayer extends PlayerBase * @return the default buffering management params supported by the source component. * @throws IllegalStateException if the internal player engine has not been * initialized, or {@code setDataSource} has not been called. + * @hide */ @NonNull public native BufferingParams getDefaultBufferingParams(); @@ -1540,6 +1535,7 @@ public class MediaPlayer extends PlayerBase * @return the current buffering management params used by the source component. * @throws IllegalStateException if the internal player engine has not been * initialized, or {@code setDataSource} has not been called. + * @hide */ @NonNull public native BufferingParams getBufferingParams(); @@ -1557,6 +1553,7 @@ public class MediaPlayer extends PlayerBase * @throws IllegalStateException if the internal player engine has not been * initialized or has been released, or {@code setDataSource} has not been called. * @throws IllegalArgumentException if params is invalid or not supported. + * @hide */ public native void setBufferingParams(@NonNull BufferingParams params);