Merge "Added extra fields in LinkAddress"

am: b3a6e91f22

Change-Id: I2b92cb1e9fffe1bcf7d78244ba0e897432dc7f48

1 files changed, 5 insertions, 4 deletions

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index f194cbaef9..a5cbd59d1e 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -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);