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

Commit 9f134f1e 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: 877f3f63 

Change-Id: I7b0fd3f71a2863e880f9262ec2603dc67c52738a
parents 90ed85e8 877f3f63

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);