Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc6dd7e1 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge changes from topic "networkstack_aosp_merge" into mainline-prod 

* changes:
  Disable FrameworksNetTests
  Rename Kotlin util files to not include the Kt suffix
  Move utils from network stack to libs.
parents 2eaf9f9c 5e7448b8

packages/Tethering/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ java_defaults { 
        "android.hardware.tetheroffload.config-V1.0-java",

        "android.hardware.tetheroffload.control-V1.0-java",

        "net-utils-framework-common",

        "net-utils-device-common",

    ],

    libs: [

        "framework-statsd.stubs.module_lib",

packages/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.testutils.HandlerUtilsKt;

import com.android.testutils.HandlerUtils;

import com.android.testutils.TapPacketReader;



import org.junit.After;
@@ -366,7 +366,7 @@ public class EthernetTetheringTest { 
    private TapPacketReader makePacketReader(FileDescriptor fd, int mtu) {

        final TapPacketReader reader = new TapPacketReader(mHandler, fd, mtu);

        mHandler.post(() -> reader.start());

        HandlerUtilsKt.waitForIdle(mHandler, TIMEOUT_MS);

        HandlerUtils.waitForIdle(mHandler, TIMEOUT_MS);

        return reader;

    }

packages/Tethering/tests/unit/src/android/net/util/TetheringUtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.net.TetheringRequestParcel; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.testutils.MiscAssertsKt;

import com.android.testutils.MiscAsserts;



import org.junit.Before;

import org.junit.Test;
@@ -82,6 +82,6 @@ public class TetheringUtilsTest { 
        request.showProvisioningUi = false;

        assertFalse(TetheringUtils.isTetheringRequestEquals(mTetheringRequest, request));



        MiscAssertsKt.assertFieldCountEquals(5, TetheringRequestParcel.class);

        MiscAsserts.assertFieldCountEquals(5, TetheringRequestParcel.class);

    }

}

packages/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import static com.android.networkstack.tethering.OffloadController.StatsType.STA 
import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_UID;

import static com.android.networkstack.tethering.OffloadHardwareInterface.ForwardedStats;

import static com.android.networkstack.tethering.TetheringConfiguration.DEFAULT_TETHER_OFFLOAD_POLL_INTERVAL_MS;

import static com.android.testutils.MiscAssertsKt.assertContainsAll;

import static com.android.testutils.MiscAssertsKt.assertThrows;

import static com.android.testutils.MiscAsserts.assertContainsAll;

import static com.android.testutils.MiscAsserts.assertThrows;

import static com.android.testutils.NetworkStatsUtilsKt.assertNetworkStatsEquals;



import static junit.framework.Assert.assertNotNull;

packages/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.StateMachine;

import com.android.internal.util.test.BroadcastInterceptingContext;

import com.android.internal.util.test.FakeSettingsProvider;

import com.android.testutils.MiscAssertsKt;

import com.android.testutils.MiscAsserts;



import org.junit.After;

import org.junit.AfterClass;
@@ -1360,7 +1360,7 @@ public class TetheringTest { 
        assertEquals(0, parcel.localOnlyList.length);

        assertEquals(0, parcel.erroredIfaceList.length);

        assertEquals(0, parcel.lastErrorList.length);

        MiscAssertsKt.assertFieldCountEquals(5, TetherStatesParcel.class);

        MiscAsserts.assertFieldCountEquals(5, TetherStatesParcel.class);

    }



    @Test