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

Commit 3e022dc7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle null ApnSetting in PDCS" into tm-dev am: 3c3c8a8b 

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

Change-Id: I73aeed14cd358682e00b2dfb13a180d31cfc1aff
parents f61b6a65 3c3c8a8b

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

+1 −3
Original line number Diff line number Diff line
@@ -2013,10 +2013,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)