Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0331a3d7 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Check for null when converting nullables" am: f6ca8048

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1965458

Change-Id: If801bddab257dfe2c3d21b3156cb7c449d838708
parents 9fb503b6 f6ca8048
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3632,7 +3632,8 @@ public class RILUtils {
                .setPduSessionId(result.pduSessionId)
                .setDefaultQos(convertHalQos(result.defaultQos))
                .setQosBearerSessions(qosSessions)
                .setSliceInfo(convertHalSliceInfo(result.sliceInfo))
                .setSliceInfo(result.sliceInfo == null ? null
                        : convertHalSliceInfo(result.sliceInfo))
                .setTrafficDescriptors(trafficDescriptors)
                .build();
    }