From 9cb8dfc110bce93a2b52a8ab2e1d6d923e34f2af Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 19 Feb 2021 16:51:22 +0900 Subject: [PATCH] Move connectivity AIDLs to android.net java_sdk_libraries and apexes need to contain bootclasspath classes under predefined packages. Tethering currently uses android.net, so make sure all the connectivity bootclasspath classes are under android.net. This avoids maintaining two packages for the tethering APEX, where com.android.connectivity.aidl is only used by internal AIDL files. Bug: 182984842 Test: m Ignore-AOSP-First: needs manual cherry-pick Change-Id: I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7 --- tests/cts/net/src/android/net/cts/NetworkAgentTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt index f17e50c1e8..73f124729f 100644 --- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt +++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt @@ -18,6 +18,8 @@ package android.net.cts import android.app.Instrumentation import android.content.Context import android.net.ConnectivityManager +import android.net.INetworkAgent +import android.net.INetworkAgentRegistry import android.net.InetAddresses import android.net.IpPrefix import android.net.KeepalivePacketData @@ -65,8 +67,6 @@ import android.os.Looper import android.os.Message import android.util.DebugUtils.valueToString import androidx.test.InstrumentationRegistry -import com.android.connectivity.aidl.INetworkAgent -import com.android.connectivity.aidl.INetworkAgentRegistry import com.android.modules.utils.build.SdkLevel import com.android.net.module.util.ArrayTrackRecord import com.android.testutils.CompatUtil