diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2019-04-05 15:15:48 +0900 |
---|---|---|
committer | Lorenzo Colitti <lorenzo@google.com> | 2019-04-23 06:49:58 +0000 |
commit | ba5a420664d3d2ffcf2ed5a20c100e0a8f0434be (patch) | |
tree | a6d5f746f2301f2c200dc7b61be130361092edad /src | |
parent | 0fffc5ceb7e642166e9a7b9ef8ac3a69cbdc1773 (diff) |
Freeze the networkstack-aidl-interfaces interface
This freezes the interface as of the latest beta build, not the tip of
tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in
particular.
Generated with:
m networkstack-aidl-interfaces-freeze-api \
ipmemorystore-aidl-interfaces-freeze-api
Test: flashed, booted, WiFi and captive portal working
Bug: 128803828
Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424
Diffstat (limited to 'src')
5 files changed, 30 insertions, 0 deletions
diff --git a/src/android/net/dhcp/DhcpServer.java b/src/android/net/dhcp/DhcpServer.java index d21b5f7..b8ab94c 100644 --- a/src/android/net/dhcp/DhcpServer.java +++ b/src/android/net/dhcp/DhcpServer.java @@ -647,4 +647,9 @@ public class DhcpServer extends IDhcpServer.Stub { } } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 80d139c..96e09fa 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -557,6 +557,11 @@ public class IpClient extends StateMachine { checkNetworkStackCallingPermission(); IpClient.this.removeKeepalivePacketFilter(slot); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } public String getInterfaceName() { diff --git a/src/com/android/server/NetworkStackService.java b/src/com/android/server/NetworkStackService.java index a0a90fd..a6d7484 100644 --- a/src/com/android/server/NetworkStackService.java +++ b/src/com/android/server/NetworkStackService.java @@ -251,6 +251,11 @@ public class NetworkStackService extends Service { } } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } private static class NetworkMonitorImpl extends INetworkMonitor.Stub { @@ -325,5 +330,10 @@ public class NetworkStackService extends Service { checkNetworkStackCallingPermission(); mNm.notifyNetworkCapabilitiesChanged(nc); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } } diff --git a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java index bee4bbd..6a6bf83 100644 --- a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java +++ b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java @@ -494,4 +494,9 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { listener.onComplete(makeStatus(ERROR_INTERNAL_INTERRUPTED)); return true; } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } diff --git a/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java b/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java index 2775fde..bea7052 100644 --- a/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java +++ b/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java @@ -91,6 +91,11 @@ public final class RegularMaintenanceJobService extends JobService { } @Override + public int getInterfaceVersion() { + return this.VERSION; + } + + @Override public IBinder asBinder() { return null; } |