Merge "Merge "Fix framework and NetworkStack classes conflicts" am: 3f23efdd13... (92053770) · Commits · e / os / android_frameworks_base

Android.bp

+11 −2

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ java_defaults {
		"android.hardware.vibrator-V1.2-java",
		"android.hardware.vibrator-V1.3-java",
		"android.hardware.wifi-V1.0-java-constants",
		"networkstack-aidl-interfaces-java",
		"networkstack-aidl-framework-java",
		"netd_aidl_parcelables-java",
		"devicepolicyprotosnano",
		],
		@@ -896,7 +896,6 @@ aidl_interface {
		"core/java/android/net/DhcpResultsParcelable.aidl",
		"core/java/android/net/INetworkMonitor.aidl",
		"core/java/android/net/INetworkMonitorCallbacks.aidl",
		"core/java/android/net/IIpMemoryStore.aidl",
		"core/java/android/net/INetworkStackConnector.aidl",
		"core/java/android/net/INetworkStackStatusCallback.aidl",
		"core/java/android/net/InitialConfigurationParcelable.aidl",
		@@ -915,6 +914,16 @@ aidl_interface {
		"core/java/android/net/dhcp/IDhcpServerCallbacks.aidl",
		"core/java/android/net/ip/IIpClient.aidl",
		"core/java/android/net/ip/IIpClientCallbacks.aidl",
		],
		api_dir: "aidl/networkstack",
		}

		aidl_interface {
		name: "networkstack-aidl-framework",
		local_include_dir: "core/java",
		srcs: [
		"core/java/android/net/TcpKeepalivePacketDataParcelable.aidl",
		"core/java/android/net/IIpMemoryStore.aidl",
		"core/java/android/net/ipmemorystore/*/.aidl",
		],
		api_dir: "aidl/networkstack",

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ android_app {
		static_libs: [
		"NetworkStackLib"
		],
		jarjar_rules: "jarjar-rules-shared.txt",
		manifest: "AndroidManifest.xml",
		required: ["NetworkStackPermissionStub"],
		}
		No newline at end of file

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		rule com.android.internal.util.** android.net.networkstack.util.@1

		rule android.net.shared.Inet4AddressUtils* android.net.networkstack.shared.Inet4AddressUtils@1
		rule android.net.shared.InetAddressUtils* android.net.networkstack.shared.InetAddressUtils@1

		# Ignore DhcpResultsParcelable, but jarjar DhcpResults
		# TODO: move DhcpResults into services.net and delete from here
		rule android.net.DhcpResultsParcelable* @0
		rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1
		rule android.net.LocalLog* android.net.networkstack.LocalLog@1

		# TODO: remove from framework dependencies, then remove here
		rule android.net.InterfaceConfigurationParcel* android.net.networkstack.InterfaceConfigurationParcel@1
		rule android.net.TetherStatsParcel* android.net.networkstack.TetherStatsParcel@1

		# Used by UidRange, which is used by framework classes such as NetworkCapabilities.
		rule android.net.UidRangeParcel* android.net.networkstack.UidRangeParcel@1
		# TODO: move TcpKeepalivePacketData to services.net and delete
		rule android.net.TcpKeepalivePacketDataParcelable* android.net.networkstack.TcpKeepalivePacketDataParcelable@1
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package android.net.dhcp;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.net.shared.FdEventsReader;
		import android.net.util.FdEventsReader;
		import android.os.Handler;
		import android.system.Os;

+1 −2

Original line number	Diff line number	Diff line
		@@ -14,14 +14,13 @@
		* limitations under the License.
		*/

		package android.net.shared;
		package android.net.util;

		import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR;
		import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.net.util.SocketUtils;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.MessageQueue;