Merge "mediaplayer: add buffering settings API" (3416cc28) · Commits · e / os / android_frameworks_base

api/current.txt

+37 −0

Original line number	Diff line number	Diff line
		@@ -20900,6 +20900,40 @@ 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);
		@@ -22072,7 +22106,9 @@ package android.media {
		method public static android.media.MediaPlayer create(android.content.Context, int, android.media.AudioAttributes, int);
		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 int getDuration();
		method public android.media.PlaybackParams getPlaybackParams();
		method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
		@@ -22095,6 +22131,7 @@ 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>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
		method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

api/system-current.txt

+37 −0

Original line number	Diff line number	Diff line
		@@ -22500,6 +22500,40 @@ 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);
		@@ -23672,7 +23706,9 @@ package android.media {
		method public static android.media.MediaPlayer create(android.content.Context, int, android.media.AudioAttributes, int);
		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 int getDuration();
		method public android.media.PlaybackParams getPlaybackParams();
		method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
		@@ -23695,6 +23731,7 @@ 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>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
		method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

api/test-current.txt

+37 −0

Original line number	Diff line number	Diff line
		@@ -20990,6 +20990,40 @@ 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);
		@@ -22162,7 +22196,9 @@ package android.media {
		method public static android.media.MediaPlayer create(android.content.Context, int, android.media.AudioAttributes, int);
		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 int getDuration();
		method public android.media.PlaybackParams getPlaybackParams();
		method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
		@@ -22185,6 +22221,7 @@ 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>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
		method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

media/java/android/media/BufferingParams.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media;

		parcelable BufferingParams;

media/java/android/media/BufferingParams.java

0 → 100644

+459 −0

File added.

Preview size limit exceeded, changes collapsed.