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

Commit ea477002 authored by Nagendra Prasad Nagarle Basavaraju's avatar Nagendra Prasad Nagarle Basavaraju
Browse files

Handle NPE at DataNetworkController 

Allow old network registration info null check, before comparing old and new available services info at nri, for deciding on
reevaluation of existing network requests for data connection.

Flag: EXEMPT BugFix
Bug: 412432392
Test: m and atest
Change-Id: I988d9ef3ab8a441c467eacd00fc0f0ecd12cf954
parent f40c3324

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)) {