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

Commit 871629bd authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Handle null ApnSetting in PDCS" am: 600bc1f2 am: 9b79ebed 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032086

Change-Id: I3a566cd3a6b96fe0555e393cfc381d0cd7d5a6fe
parents 925fa3fe 9b79ebed

services/core/java/com/android/server/TelephonyRegistry.java

+1 −3
Original line number Diff line number Diff line
@@ -2009,10 +2009,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            return;

        }



        ApnSetting apnSetting = preciseState.getApnSetting();



        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

            if (validatePhoneId(phoneId) && preciseState.getApnSetting() != null) {

                Pair<Integer, ApnSetting> key = Pair.create(preciseState.getTransportType(),

                        preciseState.getApnSetting());

                PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId)