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

Commit f168f9b3 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fix NullPointerException during setupDataCall" 

am: b38959c8

Change-Id: I157397e02b4464879cd022e15a6c6be512345890
parents 1414e996 b38959c8

src/java/com/android/internal/telephony/RIL.java

+2 −4
Original line number Diff line number Diff line
@@ -1146,14 +1146,12 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                            dpi, dataProfile.isModemCognitive(), allowRoaming, isRoaming);

                } else {

                    // IRadio V1.2

                    ArrayList<String> addresses = null;

                    ArrayList<String> dnses = null;

                    ArrayList<String> addresses = new ArrayList<>();

                    ArrayList<String> dnses = new ArrayList<>();

                    if (linkProperties != null) {

                        addresses = new ArrayList<>();

                        for (InetAddress address : linkProperties.getAddresses()) {

                            addresses.add(address.getHostAddress());

                        }

                        dnses = new ArrayList<>();

                        for (InetAddress dns : linkProperties.getDnsServers()) {

                            dnses.add(dns.getHostAddress());

                        }