LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Migrate unsafe parcel APIs in framework-minus-apex"

Browse Source 
This reverts commit e82600c40c.

Reason for revert: b/214053959

Change-Id: Ic271bab1d3eaf677a5989dda9deb944ee2ad6850
This commit is contained in:
Bernardo Rufino
2022-01-12 17:44:44 +00:00
parent e82600c40c
commit 7fe4f60b74
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework-t/src/android/net/DataUsageRequest.java
View File

@@ -75,7 +75,7 @@ public final class DataUsageRequest implements Parcelable {
@Override @Override
public DataUsageRequest createFromParcel(Parcel in) { public DataUsageRequest createFromParcel(Parcel in) {
int requestId = in.readInt(); int requestId = in.readInt();
NetworkTemplate template = in.readParcelable(null, android.net.NetworkTemplate.class); NetworkTemplate template = in.readParcelable(null);
long thresholdInBytes = in.readLong(); long thresholdInBytes = in.readLong();
DataUsageRequest result = new DataUsageRequest(requestId, template, DataUsageRequest result = new DataUsageRequest(requestId, template,
thresholdInBytes); thresholdInBytes);

8
framework-t/src/android/net/IpSecConfig.java
View File

@@ -267,14 +267,14 @@ public final class IpSecConfig implements Parcelable {
mMode = in.readInt(); mMode = in.readInt();
mSourceAddress = in.readString(); mSourceAddress = in.readString();
mDestinationAddress = in.readString(); mDestinationAddress = in.readString();
mNetwork = (Network) in.readParcelable(Network.class.getClassLoader(), android.net.Network.class); mNetwork = (Network) in.readParcelable(Network.class.getClassLoader());
mSpiResourceId = in.readInt(); mSpiResourceId = in.readInt();
mEncryption = mEncryption =
(IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader(), android.net.IpSecAlgorithm.class); (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());
mAuthentication = mAuthentication =
(IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader(), android.net.IpSecAlgorithm.class); (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());
mAuthenticatedEncryption = mAuthenticatedEncryption =
(IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader(), android.net.IpSecAlgorithm.class); (IpSecAlgorithm) in.readParcelable(IpSecAlgorithm.class.getClassLoader());
mEncapType = in.readInt(); mEncapType = in.readInt();
mEncapSocketResourceId = in.readInt(); mEncapSocketResourceId = in.readInt();
mEncapRemotePort = in.readInt(); mEncapRemotePort = in.readInt();

2
framework-t/src/android/net/IpSecUdpEncapResponse.java
View File

@@ -80,7 +80,7 @@ public final class IpSecUdpEncapResponse implements Parcelable {
status = in.readInt(); status = in.readInt();
resourceId = in.readInt(); resourceId = in.readInt();
port = in.readInt(); port = in.readInt();
fileDescriptor = in.readParcelable(ParcelFileDescriptor.class.getClassLoader(), android.os.ParcelFileDescriptor.class); fileDescriptor = in.readParcelable(ParcelFileDescriptor.class.getClassLoader());
} }
public static final @android.annotation.NonNull Parcelable.Creator<IpSecUdpEncapResponse> CREATOR = public static final @android.annotation.NonNull Parcelable.Creator<IpSecUdpEncapResponse> CREATOR =

6
framework-t/src/android/net/NetworkStateSnapshot.java
View File

@@ -73,9 +73,9 @@ public final class NetworkStateSnapshot implements Parcelable {
/** @hide */ /** @hide */
public NetworkStateSnapshot(@NonNull Parcel in) { public NetworkStateSnapshot(@NonNull Parcel in) {
mNetwork = in.readParcelable(null, android.net.Network.class); mNetwork = in.readParcelable(null);
mNetworkCapabilities = in.readParcelable(null, android.net.NetworkCapabilities.class); mNetworkCapabilities = in.readParcelable(null);
mLinkProperties = in.readParcelable(null, android.net.LinkProperties.class); mLinkProperties = in.readParcelable(null);
mSubscriberId = in.readString(); mSubscriberId = in.readString();
mLegacyType = in.readInt(); mLegacyType = in.readInt();
} }

2
framework-t/src/android/net/UnderlyingNetworkInfo.java
View File

@@ -60,7 +60,7 @@ public final class UnderlyingNetworkInfo implements Parcelable {
mOwnerUid = in.readInt(); mOwnerUid = in.readInt();
mIface = in.readString(); mIface = in.readString();
List<String> underlyingIfaces = new ArrayList<>(); List<String> underlyingIfaces = new ArrayList<>();
in.readList(underlyingIfaces, null /*classLoader*/, java.lang.String.class); in.readList(underlyingIfaces, null /*classLoader*/);
mUnderlyingIfaces = Collections.unmodifiableList(underlyingIfaces); mUnderlyingIfaces = Collections.unmodifiableList(underlyingIfaces);
} }