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

Commit c970ae31 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Move utils from network stack to libs." am: 21be4fab am: bfadef51... 

Merge "Move utils from network stack to libs." am: 21be4fab am: bfadef51 am: 7a3454f4 am: 29826a7a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: I91978c34aa86b30969fdb90e57c1edd862a53a51
parents 2474b5d8 29826a7a

packages/Tethering/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,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",

tests/net/common/java/android/net/NetworkProviderTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -19,23 +19,23 @@ package android.net 
import android.app.Instrumentation

import android.content.Context

import android.net.NetworkCapabilities.TRANSPORT_TEST

import android.net.NetworkProviderTest.TestNetworkCallback.CallbackEntry.OnUnavailable

import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequestWithdrawn

import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequested

import android.os.Build

import android.os.HandlerThread

import android.os.Looper

import android.net.NetworkProviderTest.TestNetworkCallback.CallbackEntry.OnUnavailable

import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequested

import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequestWithdrawn

import androidx.test.InstrumentationRegistry

import com.android.testutils.ArrayTrackRecord

import com.android.net.module.util.ArrayTrackRecord

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo

import com.android.testutils.DevSdkIgnoreRunner

import java.util.UUID

import kotlin.test.assertEquals

import kotlin.test.assertNotEquals

import org.junit.After

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import java.util.UUID

import kotlin.test.assertEquals

import kotlin.test.assertNotEquals



private const val DEFAULT_TIMEOUT_MS = 5000L

private val instrumentation: Instrumentation

tests/net/java/com/android/server/NetIdManagerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.server 
import androidx.test.filters.SmallTest

import androidx.test.runner.AndroidJUnit4

import com.android.server.NetIdManager.MIN_NET_ID

import com.android.testutils.ExceptionUtils.ThrowingRunnable

import com.android.testutils.assertThrows

import com.android.testutils.ExceptionUtils.ThrowingRunnable

import org.junit.Test

import org.junit.runner.RunWith

import kotlin.test.assertEquals