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

Commit f89ca5a3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if APN setting is null" am: fb329ef8 am: d1d8d5a6 

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



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

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

+4 −1
Original line number Diff line number Diff line
@@ -976,7 +976,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.