2ace102c5e
This reverts commit 7fe4f60b74.
Reintroducing ag/16366278 since it seems unrelated to b/214053959 (more details on b/214053959#comment55).
Original commit message:
Migrate unsafe parcel APIs in framework-minus-apex
Migrate the following unsafe parcel APIs in framework-minus-apex:
* Parcel.readSerializable()
* Parcel.readArrayList()
* Parcel.readList()
* Parcel.readParcelable()
* Parcel.readParcelableList()
* Parcel.readSparseArray()
This CL was generated by applying lint fixes that infer the expected
type from the caller code and provide that as the type parameter
(ag/16365240).
A few observations:
* In some classes we couldn't migrate because the class also belonged to
another build module whose min SDK wasn't current (as is the case for
framework-minus-apex), hence I suppressed the lint check
(since I'll eventually submit the lint check to the tree).
* In some cases, I needed to do the cast in
https://stackoverflow.com/a/1080525/5765705 to make the compiler happy
since there isn't another way of providing a class of type
Class<MyClassWithGenerics<T>>.
* In the readSerializable() case, the new API also requires the class
loader, that was inferred to by InferredClass.class.getClassLoader().
* Note that automatic formatting and import rely on running hooked up
to the IDE, which wasn't the case here.
Bug: 195622897
Change-Id: I272432e6e082a973f7a50492ec35d79c2b577c93
Test: TH passes
99 lines
3.6 KiB
Java
99 lines
3.6 KiB
Java
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package android.net;
|
|
|
|
import android.os.Parcel;
|
|
import android.os.ParcelFileDescriptor;
|
|
import android.os.Parcelable;
|
|
|
|
import java.io.FileDescriptor;
|
|
import java.io.IOException;
|
|
|
|
/**
|
|
* This class is used to return a UDP Socket and corresponding status from the IpSecService to an
|
|
* IpSecManager.UdpEncapsulationSocket.
|
|
*
|
|
* @hide
|
|
*/
|
|
public final class IpSecUdpEncapResponse implements Parcelable {
|
|
private static final String TAG = "IpSecUdpEncapResponse";
|
|
|
|
public final int resourceId;
|
|
public final int port;
|
|
public final int status;
|
|
// There is a weird asymmetry with FileDescriptor: you can write a FileDescriptor
|
|
// but you read a ParcelFileDescriptor. To circumvent this, when we receive a FD
|
|
// from the user, we immediately create a ParcelFileDescriptor DUP, which we invalidate
|
|
// on writeParcel() by setting the flag to do close-on-write.
|
|
// TODO: tests to ensure this doesn't leak
|
|
public final ParcelFileDescriptor fileDescriptor;
|
|
|
|
// Parcelable Methods
|
|
|
|
@Override
|
|
public int describeContents() {
|
|
return (fileDescriptor != null) ? Parcelable.CONTENTS_FILE_DESCRIPTOR : 0;
|
|
}
|
|
|
|
@Override
|
|
public void writeToParcel(Parcel out, int flags) {
|
|
out.writeInt(status);
|
|
out.writeInt(resourceId);
|
|
out.writeInt(port);
|
|
out.writeParcelable(fileDescriptor, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
|
|
}
|
|
|
|
public IpSecUdpEncapResponse(int inStatus) {
|
|
if (inStatus == IpSecManager.Status.OK) {
|
|
throw new IllegalArgumentException("Valid status implies other args must be provided");
|
|
}
|
|
status = inStatus;
|
|
resourceId = IpSecManager.INVALID_RESOURCE_ID;
|
|
port = -1;
|
|
fileDescriptor = null; // yes I know it's redundant, but readability
|
|
}
|
|
|
|
public IpSecUdpEncapResponse(int inStatus, int inResourceId, int inPort, FileDescriptor inFd)
|
|
throws IOException {
|
|
if (inStatus == IpSecManager.Status.OK && inFd == null) {
|
|
throw new IllegalArgumentException("Valid status implies FD must be non-null");
|
|
}
|
|
status = inStatus;
|
|
resourceId = inResourceId;
|
|
port = inPort;
|
|
fileDescriptor = (status == IpSecManager.Status.OK) ? ParcelFileDescriptor.dup(inFd) : null;
|
|
}
|
|
|
|
private IpSecUdpEncapResponse(Parcel in) {
|
|
status = in.readInt();
|
|
resourceId = in.readInt();
|
|
port = in.readInt();
|
|
fileDescriptor = in.readParcelable(ParcelFileDescriptor.class.getClassLoader(), android.os.ParcelFileDescriptor.class);
|
|
}
|
|
|
|
@android.annotation.NonNull
|
|
public static final Parcelable.Creator<IpSecUdpEncapResponse> CREATOR =
|
|
new Parcelable.Creator<IpSecUdpEncapResponse>() {
|
|
public IpSecUdpEncapResponse createFromParcel(Parcel in) {
|
|
return new IpSecUdpEncapResponse(in);
|
|
}
|
|
|
|
public IpSecUdpEncapResponse[] newArray(int size) {
|
|
return new IpSecUdpEncapResponse[size];
|
|
}
|
|
};
|
|
}
|