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

Commit 7d4a8df0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Added extra fields in LinkAddress" am: b3a6e91f am: b8f708b0 

Change-Id: I0d263baeab208090cd2c1d95e8138457fd074d0e
parents f59e0237 b8f708b0

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

+5 −4
Original line number Diff line number Diff line
@@ -1583,7 +1583,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);

                        }

                    }
@@ -6394,10 +6395,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);