Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23dfee52 authored by Wei Jia's avatar Wei Jia
Browse files

mediaplayer: add buffering settings API 

Test: compiles, ensured that params is passed all the way to source
Bug:32524218

Change-Id: I90d65e10012ecc1a78989eba80d025d513ceaadf
parent 65e8f0ad

api/current.txt

+37 −0
Original line number Diff line number Diff line
@@ -20711,6 +20711,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);










@@ -21883,7 +21917,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;









@@ -21906,6 +21942,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








@@ -22296,6 +22296,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);










@@ -23468,7 +23502,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;









@@ -23491,6 +23527,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








@@ -20801,6 +20801,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);










@@ -21973,7 +22007,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;









@@ -21996,6 +22032,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.