Move NetworkCapabilitiesUtils to framework-common
Also move CollectionUtils which is a dependency.
NetworkCapabilitiesUtils is needed in BatteryStatsImpl, which is in
frameworks/base/core, so it uses the framework-common library.
The current framework-common target cannot use androidx annotations due
to users of this filegroup. This is being addressed in another change;
use android.annotation annotations in the meantime.
Bug: 174436414
Test: m
Change-Id: Ie188572a6db7c1bea37550a3410d7d828409a902
diff --git a/common/Android.bp b/common/Android.bp
index c7a4bd5..c6a17fe 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -149,7 +149,6 @@
name: "net-utils-services-common-srcs",
srcs: [
"device/android/net/NetworkFactory.java",
- "device/com/android/net/module/util/CollectionUtils.java",
],
visibility: [
"//frameworks/base/services/net",
diff --git a/common/device/com/android/net/module/util/CollectionUtils.java b/common/framework/com/android/net/module/util/CollectionUtils.java
similarity index 100%
rename from common/device/com/android/net/module/util/CollectionUtils.java
rename to common/framework/com/android/net/module/util/CollectionUtils.java
diff --git a/common/device/com/android/net/module/util/NetworkCapabilitiesUtils.java b/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
similarity index 98%
rename from common/device/com/android/net/module/util/NetworkCapabilitiesUtils.java
rename to common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index dd5a481..5a0200f 100644
--- a/common/device/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -23,7 +23,8 @@
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
-import androidx.annotation.NonNull;
+import android.annotation.NonNull;
+
/**
* Utilities to examine {@link android.net.NetworkCapabilities}.
