Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I9f15005fd017442afd6894b9769df883524fc055
This commit is contained in:
Tyler Gunn
2020-05-11 21:17:55 +00:00
committed by Automerger Merge Worker
parent 50612d1d1c 68a50c1b2f
commit f94ecdc108
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telecomm/java/android/telecom/GatewayInfo.java
View File

@@ -111,7 +111,7 @@ public class GatewayInfo implements Parcelable {
@Override @Override
public void writeToParcel(Parcel destination, int flags) { public void writeToParcel(Parcel destination, int flags) {
destination.writeString(mGatewayProviderPackageName); destination.writeString(mGatewayProviderPackageName);
mGatewayAddress.writeToParcel(destination, 0); Uri.writeToParcel(destination, mGatewayAddress);
mOriginalAddress.writeToParcel(destination, 0); Uri.writeToParcel(destination, mOriginalAddress);
} }
} }

4
telecomm/java/android/telecom/ParcelableCall.java
View File

@@ -629,7 +629,7 @@ public final class ParcelableCall implements Parcelable {
int capabilities = source.readInt(); int capabilities = source.readInt();
int properties = source.readInt(); int properties = source.readInt();
long connectTimeMillis = source.readLong(); long connectTimeMillis = source.readLong();
Uri handle = source.readParcelable(classLoader); Uri handle = Uri.CREATOR.createFromParcel(source);
int handlePresentation = source.readInt(); int handlePresentation = source.readInt();
String callerDisplayName = source.readString(); String callerDisplayName = source.readString();
int callerDisplayNamePresentation = source.readInt(); int callerDisplayNamePresentation = source.readInt();
@@ -711,7 +711,7 @@ public final class ParcelableCall implements Parcelable {
destination.writeInt(mCapabilities); destination.writeInt(mCapabilities);
destination.writeInt(mProperties); destination.writeInt(mProperties);
destination.writeLong(mConnectTimeMillis); destination.writeLong(mConnectTimeMillis);
destination.writeParcelable(mHandle, 0); Uri.writeToParcel(destination, mHandle);
destination.writeInt(mHandlePresentation); destination.writeInt(mHandlePresentation);
destination.writeString(mCallerDisplayName); destination.writeString(mCallerDisplayName);
destination.writeInt(mCallerDisplayNamePresentation); destination.writeInt(mCallerDisplayNamePresentation);