1a5cb387d6
This reverts commit 331be9a643.
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
89 lines
2.7 KiB
Java
89 lines
2.7 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.telecom;
|
|
|
|
import android.os.Parcel;
|
|
import android.os.ParcelFileDescriptor;
|
|
import android.os.Parcelable;
|
|
|
|
import java.io.FileInputStream;
|
|
import java.io.FileOutputStream;
|
|
import java.io.InputStreamReader;
|
|
import java.io.OutputStreamWriter;
|
|
import java.nio.charset.StandardCharsets;
|
|
|
|
/**
|
|
* Data container for information associated with the RTT connection on a call.
|
|
* @hide
|
|
*/
|
|
public class ParcelableRttCall implements Parcelable {
|
|
private final int mRttMode;
|
|
private final ParcelFileDescriptor mTransmitStream;
|
|
private final ParcelFileDescriptor mReceiveStream;
|
|
|
|
public ParcelableRttCall(
|
|
int rttMode,
|
|
ParcelFileDescriptor transmitStream,
|
|
ParcelFileDescriptor receiveStream) {
|
|
mRttMode = rttMode;
|
|
mTransmitStream = transmitStream;
|
|
mReceiveStream = receiveStream;
|
|
}
|
|
|
|
protected ParcelableRttCall(Parcel in) {
|
|
mRttMode = in.readInt();
|
|
mTransmitStream = in.readParcelable(ParcelFileDescriptor.class.getClassLoader(), android.os.ParcelFileDescriptor.class);
|
|
mReceiveStream = in.readParcelable(ParcelFileDescriptor.class.getClassLoader(), android.os.ParcelFileDescriptor.class);
|
|
}
|
|
|
|
public static final @android.annotation.NonNull Creator<ParcelableRttCall> CREATOR = new Creator<ParcelableRttCall>() {
|
|
@Override
|
|
public ParcelableRttCall createFromParcel(Parcel in) {
|
|
return new ParcelableRttCall(in);
|
|
}
|
|
|
|
@Override
|
|
public ParcelableRttCall[] newArray(int size) {
|
|
return new ParcelableRttCall[size];
|
|
}
|
|
};
|
|
|
|
@Override
|
|
public int describeContents() {
|
|
return 0;
|
|
}
|
|
|
|
@Override
|
|
public void writeToParcel(Parcel dest, int flags) {
|
|
dest.writeInt(mRttMode);
|
|
dest.writeParcelable(mTransmitStream, flags);
|
|
dest.writeParcelable(mReceiveStream, flags);
|
|
}
|
|
|
|
public int getRttMode() {
|
|
return mRttMode;
|
|
}
|
|
|
|
public ParcelFileDescriptor getReceiveStream() {
|
|
return mReceiveStream;
|
|
}
|
|
|
|
public ParcelFileDescriptor getTransmitStream() {
|
|
return mTransmitStream;
|
|
}
|
|
}
|