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

Commit 4917bbfa authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Check for null when converting nullables" am: f6ca8048 am: 0331a3d7 am: 6ae79510 

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

Change-Id: Ibfdb86e528af13a59a6a7757f2da2517216eea97
parents 70a9ffc4 6ae79510

src/java/com/android/internal/telephony/RILUtils.java

+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();

    }