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

Commit b48034b6 authored by Sarah Chin's avatar Sarah Chin
Browse files

Fix NPE in DCT when ApnSetting is null 

Test: atest DcTrackerTest
Fix: 186031953
Change-Id: I39cafb5dab2ceff8e6e787dbeba189ae2a74fbea
Merged-In: I39cafb5dab2ceff8e6e787dbeba189ae2a74fbea
parent 1aa9c075

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+2 −1
Original line number Diff line number Diff line
@@ -2549,7 +2549,8 @@ public class DcTracker extends Handler { 
                                    + " found canHandle conn=" + curDc);

                        }

                        return curDc;

                    } else if (curDc.isActivating() || apnSetting.equals(nextApn)) {

                    } else if (curDc.isActivating()

                            || (apnSetting !=  null && apnSetting.equals(nextApn))) {

                        potentialDc = curDc;

                    }

                }