Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaPlayer: hide BufferingParams API" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-07 21:46:34 +00:00
committed by Android (Google) Code Review
parent ca2622b860 f3d93a0f69
commit 4c2a62edb6
5 changed files with 4 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
api/current.txt
View File

@@ -21480,40 +21480,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<android.media.BufferingParams> 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);
@@ -22818,9 +22784,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();
@@ -22851,7 +22815,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.lang.String, java.lang.String>, java.util.List<java.net.HttpCookie>) 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.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

37
api/system-current.txt
View File

@@ -23305,40 +23305,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<android.media.BufferingParams> 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);
@@ -24643,9 +24609,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();
@@ -24676,7 +24640,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.lang.String, java.lang.String>, java.util.List<java.net.HttpCookie>) 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.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

37
api/test-current.txt
View File

@@ -21593,40 +21593,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<android.media.BufferingParams> 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);
@@ -22931,9 +22897,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();
@@ -22964,7 +22928,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.lang.String, java.lang.String>, java.util.List<java.net.HttpCookie>) 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.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

1
media/java/android/media/BufferingParams.java
View File

@@ -63,6 +63,7 @@ import java.lang.annotation.RetentionPolicy;
* </ul>
* </ul>
* <p>Users should use {@link Builder} to change {@link BufferingParams}.
* @hide
*/
public final class BufferingParams implements Parcelable {
/**

9
media/java/android/media/MediaPlayer.java
View File

@@ -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;
* <td>{} </p></td>
* <td>This method can be called in any state and calling it does not change
* the object state. </p></td></tr>
* <tr><td>setBufferingParams</p></td>
* <td>{Initialized, Prepared, Started, Paused, Stopped, PlaybackCompleted, Error}</p></td>
* <td>{Idle} </p></td>
* <td>This method does not change the object state.
* </p></td></tr>
* <tr><td>setPlaybackParams</p></td>
* <td>{Initialized, Prepared, Started, Paused, PlaybackCompleted, Error}</p></td>
* <td>{Idle, Stopped} </p></td>
@@ -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);