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

Commit 58261366 authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in DCT when ApnSetting is null" into sc-dev

parents 3e91cb00 af68a8ad

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

+2 −1
Original line number Diff line number Diff line
@@ -2577,7 +2577,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;

                    }

                }