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

Commit af612f91 authored by Nagendra Prasad Nagarle Basavaraju's avatar Nagendra Prasad Nagarle Basavaraju Committed by Android (Google) Code Review
Browse files

Merge "Handle NPE at DataNetworkController" into main

parents b1ffd206 ea477002

src/java/com/android/internal/telephony/data/DataNetworkController.java

+4 −4
Original line number Diff line number Diff line
@@ -3888,10 +3888,6 @@ public class DataNetworkController extends Handler { 
            return false;

        }



        if (areNetworkAvailableServicesChanged(oldPsNri, newPsNri)) {

            return true;

        }



        if (oldPsNri == null

                || oldPsNri.getAccessNetworkTechnology() != newPsNri.getAccessNetworkTechnology()

                || (!oldPsNri.isInService() && newPsNri.isInService())
@@ -3900,6 +3896,10 @@ public class DataNetworkController extends Handler { 
            return true;

        }



        if (areNetworkAvailableServicesChanged(oldPsNri, newPsNri)) {

            return true;

        }



        // If CS connection is back to service on non-DDS, reevaluate for potential PS

        if (!serviceStateAllowsPSAttach(oldSS, transport)

                && serviceStateAllowsPSAttach(newSS, transport)) {