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

Commit 0d81d6f3 authored by Chiachang Wang's avatar Chiachang Wang Committed by android-build-merger
Browse files

Update package for classes am: f8f7720f am: 614f9900 

am: 6e8e7595

Change-Id: I2b031ce9c025534745c1272c4848ce14e84f5dfe
parents 819f8f7d 6e8e7595

src/com/android/networkstack/netlink/TcpInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class TcpInfo { 
    }



    @VisibleForTesting

    public TcpInfo(@NonNull HashMap<Field, Number> info) {

    TcpInfo(@NonNull HashMap<Field, Number> info) {

        for (final Field field : Field.values()) {

            mFieldsValues.put(field, info.get(field));

        }
@@ -177,7 +177,7 @@ public class TcpInfo { 
     *  Map to enum in bionic/libc/include/netinet/tcp.h

     */

    @VisibleForTesting

    public static String getTcpStateName(int state) {

    static String getTcpStateName(int state) {

        switch (state) {

            case 1: return "TCP_ESTABLISHED";

            case 2: return "TCP_SYN_SENT";

tests/lib/src/android/networkstack/util/FakeDns.kt→tests/lib/src/com/android/testutils/FakeDns.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.networkstack.util

package com.android.testutils



import android.net.DnsResolver

import android.net.InetAddresses

tests/unit/src/android/networkstack/metrics/DataStallStatsUtilsTest.kt→tests/unit/src/com/android/networkstack/metrics/DataStallStatsUtilsTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -14,12 +14,11 @@ 
 * limitations under the License.

 */



package android.networkstack.metrics

package com.android.networkstack.metrics



import android.net.captiveportal.CaptivePortalProbeResult

import androidx.test.filters.SmallTest

import androidx.test.runner.AndroidJUnit4

import com.android.networkstack.metrics.DataStallStatsUtils

import com.android.server.connectivity.nano.DataStallEventProto

import org.junit.Assert.assertEquals

import org.junit.Test

tests/unit/src/android/networkstack/netlink/TcpInfoTest.java→tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java

+1 −3
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@ 
 * limitations under the License.

 */



package android.networkstack.netlink;

package com.android.networkstack.netlink;



import static org.junit.Assert.assertEquals;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.networkstack.netlink.TcpInfo;



import libcore.util.HexEncoding;



import org.junit.Test;

tests/unit/src/android/networkstack/util/DnsUtilsTest.kt→tests/unit/src/com/android/networkstack/util/DnsUtilsTest.kt

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

 */



package android.networkstack.util

package com.android.networkstack.netlink.util



import android.net.DnsResolver

import android.net.DnsResolver.FLAG_EMPTY

import android.net.DnsResolver.TYPE_A

import android.net.DnsResolver.TYPE_AAAA

import android.net.Network

import com.android.testutils.FakeDns

import androidx.test.filters.SmallTest

import androidx.test.runner.AndroidJUnit4

import com.android.networkstack.util.DnsUtils