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

Commit 3c3c8a8b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Handle null ApnSetting in PDCS" into tm-dev

parents 04248bdd 87af38b1

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

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

            return;

        }

        }





        ApnSetting apnSetting = preciseState.getApnSetting();



        synchronized (mRecords) {

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

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

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

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

                        preciseState.getApnSetting());

                        preciseState.getApnSetting());

                PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId)

                PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId)