diff options
| -rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 8 | ||||
| -rw-r--r-- | services/core/Android.bp | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/NetworkManagementService.java | 8 | ||||
| -rw-r--r-- | services/net/Android.bp | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 135138030e43..9b8a40a6cab0 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -150,6 +150,14 @@ interface INetworkManagementService void startTethering(in String[] dhcpRanges); /** + * Start tethering services with the specified dhcp server range and + * DNS proxy config. + * {@code boolean} is used to control legacy DNS proxy server. + * {@code String[]} is a set of start end pairs defining the ranges. + */ + void startTetheringWithConfiguration(boolean usingLegacyDnsProxy, in String[] dhcpRanges); + + /** * Stop currently running tethering services */ @UnsupportedAppUsage diff --git a/services/core/Android.bp b/services/core/Android.bp index c838c6044e1d..16432212d8e2 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -53,7 +53,7 @@ java_library_static { "android.hardware.contexthub-V1.0-java", "android.hidl.manager-V1.2-java", "dnsresolver_aidl_interface-V2-java", - "netd_aidl_interface-V2-java", + "netd_aidl_interface-java", "netd_event_listener_interface-java", ], } diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 59e0a28f2ae1..9efaad848ccc 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1008,11 +1008,15 @@ public class NetworkManagementService extends INetworkManagementService.Stub { @Override public void startTethering(String[] dhcpRange) { + startTetheringWithConfiguration(true, dhcpRange); + } + + @Override + public void startTetheringWithConfiguration(boolean usingLegacyDnsProxy, String[] dhcpRange) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); // an odd number of addrs will fail - try { - mNetdService.tetherStart(dhcpRange); + mNetdService.tetherStartWithConfiguration(usingLegacyDnsProxy, dhcpRange); } catch (RemoteException | ServiceSpecificException e) { throw new IllegalStateException(e); } diff --git a/services/net/Android.bp b/services/net/Android.bp index fb548f9975c5..8f8f9f9bbf55 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -67,7 +67,7 @@ java_library_static { static_libs: [ "dnsresolver_aidl_interface-V2-java", "ipmemorystore-client", - "netd_aidl_interface-V2-java", + "netd_aidl_interface-java", "networkstack-aidl-interfaces-V3-java", ], } |