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

Commit 832fd8f9 authored by Shuo Qian's avatar Shuo Qian
Browse files

Don't use InetAddressUtils utilities. Use InetAddresses instead 

Test: Treehugger; no function change
Bug: 147699696
Change-Id: Ifacde879ff9b81f55ea437ecb2b1dd6c61dddc15
parent 567f1fb0

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

+7 −8
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.hardware.radio.V1_4.CarrierRestrictionsWithPriority; 
import android.hardware.radio.V1_4.SimLockMultiSimPolicy;

import android.hardware.radio.V1_5.AccessNetwork;

import android.hardware.radio.deprecated.V1_0.IOemHook;

import android.net.InetAddresses;

import android.net.KeepalivePacketData;

import android.net.LinkAddress;

import android.net.LinkProperties;
@@ -84,7 +85,6 @@ import android.telephony.NetworkScanRequest; 
import android.telephony.PhoneNumberUtils;

import android.telephony.RadioAccessFamily;

import android.telephony.RadioAccessSpecifier;

import com.android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SignalThresholdInfo;
@@ -112,8 +112,7 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; 
import com.android.internal.telephony.nano.TelephonyProto.SmsSession;

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.util.TelephonyUtils;



import libcore.net.InetAddressUtils;

import com.android.telephony.Rlog;



import java.io.ByteArrayInputStream;

import java.io.DataInputStream;
@@ -6361,7 +6360,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            ifname = result.ifname;

            //addresses = result.addresses.stream().toArray(String[]::new);

            laList = result.addresses.stream().map(a -> new LinkAddress(

                    InetAddressUtils.parseNumericAddress(a.address), 0, a.properties, 0))

                    InetAddresses.parseNumericAddress(a.address), 0, a.properties, 0))

                    .collect(Collectors.toList());

            dnses = result.dnses.stream().toArray(String[]::new);

            gateways = result.gateways.stream().toArray(String[]::new);
@@ -6387,7 +6386,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                        if (address.split("/").length == 2) {

                            la = new LinkAddress(address);

                        } else {

                            InetAddress ia = InetAddressUtils.parseNumericAddress(address);

                            InetAddress ia = InetAddresses.parseNumericAddress(address);

                            la = new LinkAddress(ia, (ia instanceof Inet4Address) ? 32 : 128);

                        }
@@ -6406,7 +6405,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                dns = dns.trim();

                InetAddress ia;

                try {

                    ia = InetAddressUtils.parseNumericAddress(dns);

                    ia = InetAddresses.parseNumericAddress(dns);

                    dnsList.add(ia);

                } catch (IllegalArgumentException e) {

                    Rlog.e(RILJ_LOG_TAG, "Unknown dns: " + dns, e);
@@ -6421,7 +6420,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                gateway = gateway.trim();

                InetAddress ia;

                try {

                    ia = InetAddressUtils.parseNumericAddress(gateway);

                    ia = InetAddresses.parseNumericAddress(gateway);

                    gatewayList.add(ia);

                } catch (IllegalArgumentException e) {

                    Rlog.e(RILJ_LOG_TAG, "Unknown gateway: " + gateway, e);
@@ -6436,7 +6435,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                pcscf = pcscf.trim();

                InetAddress ia;

                try {

                    ia = InetAddressUtils.parseNumericAddress(pcscf);

                    ia = InetAddresses.parseNumericAddress(pcscf);

                    pcscfList.add(ia);

                } catch (IllegalArgumentException e) {

                    Rlog.e(RILJ_LOG_TAG, "Unknown pcscf: " + pcscf, e);

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

+1 −3
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ import com.android.internal.util.State; 
import com.android.internal.util.StateMachine;

import com.android.telephony.Rlog;



import libcore.net.InetAddressUtils;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.StringWriter;
@@ -1395,7 +1393,7 @@ public class DataConnection extends StateMachine { 
        if (address.startsWith("[") && address.endsWith("]") && address.indexOf(':') != -1) {

            address = address.substring(1, address.length() - 1);

        }

        return InetAddressUtils.isNumericAddress(address);

        return InetAddresses.isNumericAddress(address);

    }



    private SetupResult setLinkProperties(DataCallResponse response,