diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-12-14 03:10:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 03:10:01 +0000 |
| commit | d7795cd5902cf2a93c1a67f25e7828873a04b1a3 (patch) | |
| tree | bc4d0724310ed7e0d3d4d33256123ca004593103 /core/java/android | |
| parent | 62621db913529f2cc2f4227b1c7ccc80c3ca403a (diff) | |
| parent | c3806f72b7b3f2cba864d53eab9fa9bc74ca5352 (diff) | |
Merge "Resolve UidRange dependency between NMS and CS module" am: c3806f72b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e55c3c4bed3d71eb48242428c179809aae00a1f
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index e1d900528f07..25d84bab89e2 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -321,16 +321,6 @@ interface INetworkManagementService void setFirewallChainEnabled(int chain, boolean enable); /** - * Set all packets from users in ranges to go through VPN specified by netId. - */ - void addVpnUidRanges(int netId, in UidRange[] ranges); - - /** - * Clears the special VPN rules for users in ranges and VPN specified by netId. - */ - void removeVpnUidRanges(int netId, in UidRange[] ranges); - - /** * Start listening for mobile activity state changes. */ void registerNetworkActivityListener(INetworkActivityListener listener); @@ -361,7 +351,5 @@ interface INetworkManagementService void removeInterfaceFromLocalNetwork(String iface); int removeRoutesFromLocalNetwork(in List<RouteInfo> routes); - void setAllowOnlyVpnForUids(boolean enable, in UidRange[] uidRanges); - boolean isNetworkRestricted(int uid); } |