Merge "Add a null check for mDefaultQos in DataCallResponse.writeToParcel()" (71cb3e0e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/data/DataCallResponse.java

+7 −3

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