Snap for 7799923 from f90e90550b610f6e8fe5532a43618756e8c1d409 to mainline-os-statsd-release (7307c009) · Commits · e / os / android_packages_modules_NetworkStack

TEST_MAPPING

+1 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,7 @@
		// We must specify at least one module here or the tests won't run. Use the same set as CTS
		// so in theory the infra would not need to reinstall/reboot devices to run both.
		{
		// TODO: add back tethering when it is updatable in this branch
		"name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]"
		"name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
		}
		],
		"mainline-postsubmit": [

+0 −4

Original line number	Diff line number	Diff line
		@@ -83,10 +83,6 @@ public class NetworkMonitorUtils {
		return true;
		}

		// TODO: once TRANSPORT_TEST is @SystemApi in S and S SDK is stable (so constant shims can
		// be replaced with the SDK constant that will be inlined), replace isTestNetwork with
		// hasTransport(TRANSPORT_TEST)

		// Test networks that also have one of the major transport types are attempting to replicate
		// that transport on a test interface (for example, test ethernet networks with
		// EthernetManager#setIncludeTestInterfaces). Run validation on them for realistic tests.

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ aidl_interface {
		enabled: false,
		},
		},
		imports: ["ipmemorystore-aidl-interfaces"],
		imports: ["ipmemorystore-aidl-interfaces-V10"],
		versions: [
		"1",
		"2",

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		<string name="notification_channel_name_connected" msgid="1795068343200033922">"Godkendelse til loginportal"</string>
		<string name="notification_channel_description_connected" msgid="7239184168268014518">"De notifikationer, der vises, når enheden er blevet godkendt til et netværk via en loginportal"</string>
		<string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Oplysninger om netværksplacering"</string>
		<string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notifikationer, der vises for at indikere, at netværket har en side med oplysninger om placeringen"</string>
		<string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Notifikationer, der vises for at indikere, at netværket har en side med oplysninger om lokationen"</string>
		<string name="connected" msgid="4563643884927480998">"Der er oprettet forbindelse"</string>
		<string name="tap_for_info" msgid="6849746325626883711">"Der er oprettet forbindelse/tryk for at se website"</string>
		<string name="application_label" msgid="1322847171305285454">"Netværksadministrator"</string>

+2 −2

Original line number	Diff line number	Diff line
		@@ -715,7 +715,7 @@ public class IpClient extends StateMachine {
		(ifaceUp) -> sendMessage(EVENT_NETLINK_LINKPROPERTIES_CHANGED, ifaceUp
		? ARG_LINKPROP_CHANGED_LINKSTATE_UP
		: ARG_LINKPROP_CHANGED_LINKSTATE_DOWN),
		config, mLog) {
		config, mLog, mDependencies) {
		@Override
		public void onInterfaceAdded(String iface) {
		super.onInterfaceAdded(iface);
		@@ -906,6 +906,7 @@ public class IpClient extends StateMachine {

		private void stopStateMachineUpdaters() {
		mObserverRegistry.unregisterObserver(mLinkObserver);
		mLinkObserver.clearInterfaceParams();
		mLinkObserver.shutdown();
		}

		@@ -1969,7 +1970,6 @@ public class IpClient extends StateMachine {
		mHasDisabledIpv6OrAcceptRaOnProvLoss = false;
		mGratuitousNaTargetAddresses.clear();

		mLinkObserver.clearInterfaceParams();
		resetLinkProperties();
		if (mStartTimeMillis > 0) {
		// Completed a life-cycle; send a final empty LinkProperties