Make change and version bump to r_aml_300802100 for mainline module file: AndroidManifest.xml (8b54a173) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ java_defaults {
		"netd_aidl_interface-java",
		"netlink-client",
		"networkstack-client",
		"net-utils-framework-common",
		"datastallprotosnano",
		"statsprotos",
		"captiveportal-lib",

AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.networkstack"
		android:sharedUserId="android.uid.networkstack"
		android:versionCode="300802000"
		android:versionName="r_aml_300802000"
		android:versionCode="300802100"
		android:versionName="r_aml_300802100"
		>
		<!-- Permissions must be defined here, and not in the base manifest, as the network stack
		running in the system server process does not need any permission, and having privileged

common/networkstackclient/src/android/net/IpMemoryStoreClient.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ public abstract class IpMemoryStoreClient {
		() -> service.storeNetworkAttributes(l2Key, attributes.toParcelable(),
		OnStatusListener.toAIDL(listener))));
		} catch (ExecutionException m) {
		if (null == listener) return;
		ignoringRemoteException("Error storing network attributes",
		() -> listener.onComplete(new Status(Status.ERROR_UNKNOWN)));
		}
		@@ -116,6 +117,7 @@ public abstract class IpMemoryStoreClient {
		() -> service.storeBlob(l2Key, clientId, name, data,
		OnStatusListener.toAIDL(listener))));
		} catch (ExecutionException m) {
		if (null == listener) return;
		ignoringRemoteException("Error storing blob",
		() -> listener.onComplete(new Status(Status.ERROR_UNKNOWN)));
		}
		@@ -143,7 +145,8 @@ public abstract class IpMemoryStoreClient {
		OnL2KeyResponseListener.toAIDL(listener))));
		} catch (ExecutionException m) {
		ignoringRemoteException("Error finding L2 Key",
		() -> listener.onL2KeyResponse(new Status(Status.ERROR_UNKNOWN), null));
		() -> listener.onL2KeyResponse(new Status(Status.ERROR_UNKNOWN),
		null /* l2Key */));
		}
		}

		@@ -164,7 +167,8 @@ public abstract class IpMemoryStoreClient {
		OnSameL3NetworkResponseListener.toAIDL(listener))));
		} catch (ExecutionException m) {
		ignoringRemoteException("Error checking for network sameness",
		() -> listener.onSameL3NetworkResponse(new Status(Status.ERROR_UNKNOWN), null));
		() -> listener.onSameL3NetworkResponse(new Status(Status.ERROR_UNKNOWN),
		null /* response */));
		}
		}

		@@ -186,7 +190,7 @@ public abstract class IpMemoryStoreClient {
		} catch (ExecutionException m) {
		ignoringRemoteException("Error retrieving network attributes",
		() -> listener.onNetworkAttributesRetrieved(new Status(Status.ERROR_UNKNOWN),
		null, null));
		null /* l2Key /, null / attributes */));
		}
		}

		@@ -210,7 +214,7 @@ public abstract class IpMemoryStoreClient {
		} catch (ExecutionException m) {
		ignoringRemoteException("Error retrieving blob",
		() -> listener.onBlobRetrieved(new Status(Status.ERROR_UNKNOWN),
		null, null, null));
		null /* l2Key /, null / name /, null / blob */));
		}
		}

		@@ -235,6 +239,7 @@ public abstract class IpMemoryStoreClient {
		runWhenServiceReady(service -> ignoringRemoteException(() ->
		service.delete(l2Key, needWipe, OnDeleteStatusListener.toAIDL(listener))));
		} catch (ExecutionException m) {
		if (null == listener) return;
		ignoringRemoteException("Error deleting from the memory store",
		() -> listener.onComplete(new Status(Status.ERROR_UNKNOWN),
		0 /* deletedRecords */));
		@@ -266,6 +271,7 @@ public abstract class IpMemoryStoreClient {
		() -> service.deleteCluster(cluster, needWipe,
		OnDeleteStatusListener.toAIDL(listener))));
		} catch (ExecutionException m) {
		if (null == listener) return;
		ignoringRemoteException("Error deleting from the memory store",
		() -> listener.onComplete(new Status(Status.ERROR_UNKNOWN),
		0 /* deletedRecords */));

jarjar-rules-shared.txt

+5 −2

Original line number	Diff line number	Diff line
		# Classes from net-utils-framework-common
		rule com.android.net.module.util.** com.android.networkstack.util.@1

		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
		# Classes from net-utils-framework-common
		rule com.android.net.module.util.** com.android.networkstack.util.@1

		# Ignore DhcpResultsParcelable, but jarjar DhcpResults
		# TODO: move DhcpResults into services.net and delete from here

src/android/net/dhcp/DhcpLease.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package android.net.dhcp;

		import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTH;
		import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTH;

		import android.net.MacAddress;
		import android.os.SystemClock;