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

Commit b8150261 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Fix read/write parcel of CallAttributes" am: ed3af9f9 

am: f5e381d4

Change-Id: Ib316593d772ca2305d70a61df49b7e0e8f5eacf8
parents 8bb813dc f5e381d4

telephony/java/android/telephony/CallAttributes.java

+5 −6
Original line number Diff line number Diff line
@@ -50,10 +50,9 @@ public class CallAttributes implements Parcelable { 
    }



    private CallAttributes(Parcel in) {

        mPreciseCallState = (PreciseCallState)

                in.readValue(PreciseCallState.class.getClassLoader());

        mNetworkType = in.readInt();

        mCallQuality = (CallQuality) in.readValue(CallQuality.class.getClassLoader());

        this.mPreciseCallState = in.readParcelable(PreciseCallState.class.getClassLoader());

        this.mNetworkType = in.readInt();

        this.mCallQuality = in.readParcelable(CallQuality.class.getClassLoader());

    }



    // getters
@@ -134,9 +133,9 @@ public class CallAttributes implements Parcelable { 
     * {@link Parcelable#writeToParcel}

     */

    public void writeToParcel(Parcel dest, @Parcelable.WriteFlags int flags) {

        mPreciseCallState.writeToParcel(dest, flags);

        dest.writeParcelable(mPreciseCallState, flags);

        dest.writeInt(mNetworkType);

        mCallQuality.writeToParcel(dest, flags);

        dest.writeParcelable(mCallQuality, flags);

    }



    public static final Parcelable.Creator<CallAttributes> CREATOR = new Parcelable.Creator() {