diff options
Diffstat (limited to 'common')
4 files changed, 49 insertions, 82 deletions
diff --git a/common/moduleutils/Android.bp b/common/moduleutils/Android.bp index 93ee00c..9dfec42 100644 --- a/common/moduleutils/Android.bp +++ b/common/moduleutils/Android.bp @@ -22,7 +22,6 @@ filegroup { srcs: [ "src/android/net/util/SharedLog.java", "src/android/net/shared/InitialConfiguration.java", - "src/android/net/shared/IpConfigurationParcelableUtil.java", "src/android/net/shared/Layer2Information.java", "src/android/net/shared/LinkPropertiesParcelableUtil.java", "src/android/net/shared/ParcelableUtil.java", diff --git a/common/moduleutils/src/android/net/shared/IpConfigurationParcelableUtil.java b/common/moduleutils/src/android/net/shared/IpConfigurationParcelableUtil.java deleted file mode 100644 index 7ef764b..0000000 --- a/common/moduleutils/src/android/net/shared/IpConfigurationParcelableUtil.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.shared; - -import android.annotation.Nullable; -import android.net.DhcpResults; -import android.net.DhcpResultsParcelable; -import android.net.InetAddresses; - -import java.net.Inet4Address; -import java.net.InetAddress; - -/** - * Collection of utility methods to convert to and from stable AIDL parcelables for IpClient - * configuration classes. - * @hide - */ -public final class IpConfigurationParcelableUtil { - /** - * Convert DhcpResults to a DhcpResultsParcelable. - */ - public static DhcpResultsParcelable toStableParcelable(@Nullable DhcpResults results) { - if (results == null) return null; - final DhcpResultsParcelable p = new DhcpResultsParcelable(); - p.baseConfiguration = results.toStaticIpConfiguration(); - p.leaseDuration = results.leaseDuration; - p.mtu = results.mtu; - p.serverAddress = parcelAddress(results.serverAddress); - p.vendorInfo = results.vendorInfo; - p.serverHostName = results.serverHostName; - p.captivePortalApiUrl = results.captivePortalApiUrl; - return p; - } - - /** - * Convert a DhcpResultsParcelable to DhcpResults. - */ - public static DhcpResults fromStableParcelable(@Nullable DhcpResultsParcelable p) { - if (p == null) return null; - final DhcpResults results = new DhcpResults(p.baseConfiguration); - results.leaseDuration = p.leaseDuration; - results.mtu = p.mtu; - results.serverAddress = (Inet4Address) unparcelAddress(p.serverAddress); - results.vendorInfo = p.vendorInfo; - results.serverHostName = p.serverHostName; - results.captivePortalApiUrl = p.captivePortalApiUrl; - return results; - } - - /** - * Convert InetAddress to String. - * TODO: have an InetAddressParcelable - */ - public static String parcelAddress(@Nullable InetAddress addr) { - if (addr == null) return null; - return addr.getHostAddress(); - } - - /** - * Convert String to InetAddress. - * TODO: have an InetAddressParcelable - */ - public static InetAddress unparcelAddress(@Nullable String addr) { - if (addr == null) return null; - return InetAddresses.parseNumericAddress(addr); - } -} diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp index 3ddf633..b5a3e95 100644 --- a/common/networkstackclient/Android.bp +++ b/common/networkstackclient/Android.bp @@ -124,6 +124,7 @@ java_library { "src/android/net/IpMemoryStoreClient.java", "src/android/net/ipmemorystore/**/*.java", "src/android/net/networkstack/**/*.java", + "src/android/net/shared/**/*.java", ], static_libs: [ "ipmemorystore-aidl-interfaces-java", diff --git a/common/networkstackclient/src/android/net/shared/IpConfigurationParcelableUtil.java b/common/networkstackclient/src/android/net/shared/IpConfigurationParcelableUtil.java new file mode 100644 index 0000000..e8152cf --- /dev/null +++ b/common/networkstackclient/src/android/net/shared/IpConfigurationParcelableUtil.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.shared; + +import android.annotation.Nullable; +import android.net.InetAddresses; + +import java.net.InetAddress; + +/** + * Collection of utility methods to convert to and from stable AIDL parcelables for IpClient + * configuration classes. + * @hide + */ +public final class IpConfigurationParcelableUtil { + + /** + * Convert InetAddress to String. + * TODO: have an InetAddressParcelable + */ + public static String parcelAddress(@Nullable InetAddress addr) { + if (addr == null) return null; + return addr.getHostAddress(); + } + + /** + * Convert String to InetAddress. + * TODO: have an InetAddressParcelable + */ + public static InetAddress unparcelAddress(@Nullable String addr) { + if (addr == null) return null; + return InetAddresses.parseNumericAddress(addr); + } +} |