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

Commit 350a0528 authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am 194118f9: Merge "Make PlaybackParams parcelable" into mnc-dev 

* commit '194118f9':
  Make PlaybackParams parcelable
parents 303d360e 194118f9

api/current.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -16462,18 +16462,21 @@ package android.media { 
    ctor public NotProvisionedException(java.lang.String);

    ctor public NotProvisionedException(java.lang.String);

  }

  }

















  public final class PlaybackParams {







  public final class PlaybackParams implements android.os.Parcelable {











    ctor public PlaybackParams();







    ctor public PlaybackParams();











    method public android.media.PlaybackParams allowDefaults();







    method public android.media.PlaybackParams allowDefaults();














    method public int describeContents();











    method public int getAudioFallbackMode();







    method public int getAudioFallbackMode();











    method public float getPitch();







    method public float getPitch();











    method public float getSpeed();







    method public float getSpeed();











    method public android.media.PlaybackParams setAudioFallbackMode(int);







    method public android.media.PlaybackParams setAudioFallbackMode(int);











    method public android.media.PlaybackParams setPitch(float);







    method public android.media.PlaybackParams setPitch(float);











    method public android.media.PlaybackParams setSpeed(float);







    method public android.media.PlaybackParams setSpeed(float);














    method public void writeToParcel(android.os.Parcel, int);











    field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0







    field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0











    field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2







    field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2











    field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1







    field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1














    field public static final android.os.Parcelable.Creator<android.media.PlaybackParams> CREATOR;











  }







  }



























  public final class Rating implements android.os.Parcelable {







  public final class Rating implements android.os.Parcelable {

























api/system-current.txt



+4
−1




























Original line number
Original line
Diff line number
Diff line








@@ -17703,18 +17703,21 @@ package android.media {









    ctor public NotProvisionedException(java.lang.String);







    ctor public NotProvisionedException(java.lang.String);











  }







  }



























  public final class PlaybackParams {







  public final class PlaybackParams implements android.os.Parcelable {











    ctor public PlaybackParams();







    ctor public PlaybackParams();











    method public android.media.PlaybackParams allowDefaults();







    method public android.media.PlaybackParams allowDefaults();














    method public int describeContents();











    method public int getAudioFallbackMode();







    method public int getAudioFallbackMode();











    method public float getPitch();







    method public float getPitch();











    method public float getSpeed();







    method public float getSpeed();











    method public android.media.PlaybackParams setAudioFallbackMode(int);







    method public android.media.PlaybackParams setAudioFallbackMode(int);











    method public android.media.PlaybackParams setPitch(float);







    method public android.media.PlaybackParams setPitch(float);











    method public android.media.PlaybackParams setSpeed(float);







    method public android.media.PlaybackParams setSpeed(float);














    method public void writeToParcel(android.os.Parcel, int);











    field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0







    field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0











    field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2







    field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2











    field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1







    field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1














    field public static final android.os.Parcelable.Creator<android.media.PlaybackParams> CREATOR;











  }







  }



























  public final class Rating implements android.os.Parcelable {







  public final class Rating implements android.os.Parcelable {

























media/java/android/media/PlaybackParams.aidl
0 → 100644



+19
−0




























Original line number
Original line
Diff line number
Diff line














/*














 * Copyright 2015 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 PlaybackParams;
























media/java/android/media/PlaybackParams.java



+47
−3




























Original line number
Original line
Diff line number
Diff line








@@ -16,11 +16,13 @@





























package android.media;







package android.media;


































import android.annotation.IntDef;














import android.os.Parcel;














import android.os.Parcelable;


























import java.lang.annotation.Retention;







import java.lang.annotation.Retention;











import java.lang.annotation.RetentionPolicy;







import java.lang.annotation.RetentionPolicy;































import android.annotation.IntDef;





























/**







/**











 * Structure for common playback params.







 * Structure for common playback params.











 *







 *










@@ -52,7 +54,7 @@ import android.annotation.IntDef;









 * similar to {@link AudioTrack#setPlaybackRate(int)}.</li>







 * similar to {@link AudioTrack#setPlaybackRate(int)}.</li>











 * </ul>







 * </ul>











 */







 */











public final class PlaybackParams {







public final class PlaybackParams implements Parcelable {











    /** @hide */







    /** @hide */











    @IntDef(







    @IntDef(











        value = {







        value = {










@@ -94,6 +96,20 @@ public final class PlaybackParams {









    private float mPitch = 1.0f;







    private float mPitch = 1.0f;











    private float mSpeed = 1.0f;







    private float mSpeed = 1.0f;


































    public PlaybackParams() {














    }





























    private PlaybackParams(Parcel in) {














        mSet = in.readInt();














        mAudioFallbackMode = in.readInt();














        mAudioStretchMode = in.readInt();














        mPitch = in.readFloat();














        if (mPitch < 0.f) {














            mPitch = 0.f;














        }














        mSpeed = in.readFloat();














    }


























    /**







    /**











     * Allows defaults to be returned for properties not set.







     * Allows defaults to be returned for properties not set.











     * Otherwise a {@link java.lang.IllegalArgumentException} exception







     * Otherwise a {@link java.lang.IllegalArgumentException} exception










@@ -203,4 +219,32 @@ public final class PlaybackParams {









        }







        }











        return mSpeed;







        return mSpeed;











    }







    }





























    public static final Parcelable.Creator<PlaybackParams> CREATOR =














            new Parcelable.Creator<PlaybackParams>() {














                @Override














                public PlaybackParams createFromParcel(Parcel in) {














                    return new PlaybackParams(in);














                }





























                @Override














                public PlaybackParams[] newArray(int size) {














                    return new PlaybackParams[size];














                }














            };












































    @Override














    public int describeContents() {














        return 0;














    }





























    @Override














    public void writeToParcel(Parcel dest, int flags) {














        dest.writeInt(mSet);














        dest.writeInt(mAudioFallbackMode);














        dest.writeInt(mAudioStretchMode);














        dest.writeFloat(mPitch);














        dest.writeFloat(mSpeed);














    }











}






}