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

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

Merge "Fix parceling and unparceling for URIs in Telecom." am: 68a50c1b 

Change-Id: I9f15005fd017442afd6894b9769df883524fc055
parents 50612d1d 68a50c1b

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