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

Commit 13c57a22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if APN setting is null" into tm-dev am: d4513489 

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



Change-Id: Iffd73b6a81d8b1e392aaf6a2fed3eb5bf94668c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9fcbb5e d4513489

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

+4 −1
Original line number Diff line number Diff line
@@ -979,7 +979,10 @@ public class RILUtils { 
        dpi.mtuV6 = dp.getMtuV6();

        dpi.persistent = dp.isPersistent();

        dpi.preferred = dp.isPreferred();

        dpi.alwaysOn = false;

        if (dp.getApnSetting() != null) {

            dpi.alwaysOn = dp.getApnSetting().isAlwaysOn();

        }

        dpi.trafficDescriptor = convertToHalTrafficDescriptorAidl(dp.getTrafficDescriptor());



        // profile id is only meaningful when it's persistent on the modem.