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

Commit fed56a77 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14332843

Change-Id: Icc5f140fa2975c82b9502080c701f8dafbd8c032
parents e1db74b3 58261366

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;

                    }

                }