Commit Graph

2 Commits

Author SHA1 Message Date
Chiachang Wang
3faa0a0911 Add excludeLocalRoutes in NativeNetworkConfig
Add a extra field in NativeNetworkConfig to allow CS to notify
netd to exclude the local traffic from the VPN network. Also
freeze netd_aidl_interface as v8 and update the corresponding
configuration.

diff -U10 -ru -N common/netd/aidl_api/netd_aidl_interface/7/android/net/NativeNetworkConfig.aidl common/netd/aidl_api/netd_aidl_interface/8/android/net/NativeNetworkConfig.aidl

--- common/netd/aidl_api/netd_aidl_interface/7/android/net/NativeNetworkConfig.aidl	2021-10-29 14:52:13.069757396 +0800
+++ common/netd/aidl_api/netd_aidl_interface/8/android/net/NativeNetworkConfig.aidl	2022-01-11 21:35:55.088966333 +0800
@@ -33,11 +33,12 @@

 package android.net;
 /* @hide */
 @JavaDerive(equals=true, toString=true) @JavaOnlyImmutable
 parcelable NativeNetworkConfig {
   int netId;
   android.net.NativeNetworkType networkType = android.net.NativeNetworkType.PHYSICAL;
   int permission;
   boolean secure;
   android.net.NativeVpnType vpnType = android.net.NativeVpnType.PLATFORM;
+  boolean excludeLocalRoutes = false;
 }
diff -U10 -ru -N common/netd/aidl_api/netd_aidl_interface/7/.hash common/netd/aidl_api/netd_aidl_interface/8/.hash
--- common/netd/aidl_api/netd_aidl_interface/7/.hash	2021-10-29 14:52:13.069757396 +0800
+++ common/netd/aidl_api/netd_aidl_interface/8/.hash	2022-01-11 21:35:55.084966375 +0800
@@ -1 +1 @@
-850353de5d19a0dd718f8fd20791f0532e6a34c7
+e8cf8586fc5da9063818d8775e9a21c4b0addb5b

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: Icadca719aaba678b06f617c581e3c80a22248f26
2022-01-12 02:56:46 +00:00
markchien
38c3248623 Move netd AIDL to frameworks/lib/net
Clean move system/netd/server/aidl_api/ and
system/netd/server/binder/

$ diff -qr frameworks/libs/net/common/binder/netd/aidl_api/ system/netd/server/aidl_api/
$ diff -qr frameworks/libs/net/common/binder/netd/src/ system/netd/server/binder/
Only in system/netd/server/binder/: com

Bug: 201488997
Test: atest netd_integration_test
      atest netd_unit_test
Ignore-AOSP-First: the netd change(same topic) would not automerger from
aosp.
No-Typo-Check: this is a simple code move with no other changes.
BYPASS_INCLUSIVE_LANGUAGE_REASON=this is a simple code move with no other
changes and these files are frozen anyway

Change-Id: Id5bb63794aff4025355c587b372c3ff5b1054da6
Merged-In: Id5bb63794aff4025355c587b372c3ff5b1054da6
2021-10-07 14:43:03 +08:00