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

Merge "Add a null check for mDefaultQos in DataCallResponse.writeToParcel()"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-19 22:40:24 +00:00
committed by Android (Google) Code Review
parent 9a654b2886 905b674e40
commit 71cb3e0e94
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/data/DataCallResponse.java
View File

@@ -487,10 +487,14 @@ public final class DataCallResponse implements Parcelable {
dest.writeInt(mMtuV6);
dest.writeInt(mHandoverFailureMode);
dest.writeInt(mPduSessionId);
if (mDefaultQos.getType() == Qos.QOS_TYPE_EPS) {
dest.writeParcelable((EpsQos)mDefaultQos, flags);
if (mDefaultQos != null) {
if (mDefaultQos.getType() == Qos.QOS_TYPE_EPS) {
dest.writeParcelable((EpsQos) mDefaultQos, flags);
} else {
dest.writeParcelable((NrQos) mDefaultQos, flags);
}
} else {
dest.writeParcelable((NrQos)mDefaultQos, flags);
dest.writeParcelable(null, flags);
}
dest.writeList(mQosSessions);
}