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." into rvc-dev am: 877f3f63c9 am: 9f134f1eb4

Browse Source 
Change-Id: Idbec8f1d7fb298da8c85792c2419572344c221e6
This commit is contained in:
Tyler Gunn
2020-04-14 15:40:10 +00:00
committed by Automerger Merge Worker
parent 1890a058c6 9f134f1eb4
commit d986244e6e
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
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);
}
}

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

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