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

Commit b98e8421 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Added extra fields in LinkAddress"

parents 7e6adb33 735e86a4

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

+5 −4
Original line number Diff line number Diff line
@@ -1654,7 +1654,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                                    new android.hardware.radio.V1_5.LinkAddress();

                            linkAddress.address = la.getAddress().getHostAddress();

                            linkAddress.properties = la.getFlags();

                            // TODO: Add deprecated time and expired time support here.

                            linkAddress.deprecationTime = la.getDeprecationTime();

                            linkAddress.expirationTime = la.getExpirationTime();

                            addresses15.add(linkAddress);

                        }

                    }
@@ -6497,10 +6498,10 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            active = result.active;

            protocolType = result.type;

            ifname = result.ifname;

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

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

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

                    .collect(Collectors.toList());

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

                    a.deprecationTime, a.expirationTime)).collect(Collectors.toList());



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

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

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