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

Commit a8f9984e authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Fix parceling and unparceling for URIs in Telecom." into rvc-dev am:... 

Merge "Fix parceling and unparceling for URIs in Telecom." into rvc-dev am: 877f3f63 am: 9f134f1e am: d986244e

Change-Id: I39bb3e4ba8d50a90ee451b984c41124ea3bf843e
parents eef5cb87 d986244e

telecomm/java/android/telecom/GatewayInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class GatewayInfo implements Parcelable { 
    @Override

    public void writeToParcel(Parcel destination, int flags) {

        destination.writeString(mGatewayProviderPackageName);

        mGatewayAddress.writeToParcel(destination, 0);

        mOriginalAddress.writeToParcel(destination, 0);

        Uri.writeToParcel(destination, mGatewayAddress);

        Uri.writeToParcel(destination, mOriginalAddress);

    }

}

telecomm/java/android/telecom/ParcelableCall.java

+2 −2
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ public final class ParcelableCall implements Parcelable { 
            int capabilities = source.readInt();

            int properties = source.readInt();

            long connectTimeMillis = source.readLong();

            Uri handle = source.readParcelable(classLoader);

            Uri handle = Uri.CREATOR.createFromParcel(source);

            int handlePresentation = source.readInt();

            String callerDisplayName = source.readString();

            int callerDisplayNamePresentation = source.readInt();
@@ -711,7 +711,7 @@ public final class ParcelableCall implements Parcelable { 
        destination.writeInt(mCapabilities);

        destination.writeInt(mProperties);

        destination.writeLong(mConnectTimeMillis);

        destination.writeParcelable(mHandle, 0);

        Uri.writeToParcel(destination, mHandle);

        destination.writeInt(mHandlePresentation);

        destination.writeString(mCallerDisplayName);

        destination.writeInt(mCallerDisplayNamePresentation);