| commit | efc8623cb3d41c3446a59dac8f96c923da9126cb | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Jan 08 11:50:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 08 11:50:33 2021 +0000 |
| tree | acdeadf5edcec25b051856dcc6a8d2e1ef579ccb | |
| parent | cabdd1ac885ced65ab4da19e5b027b45856e2e84 [diff] | |
| parent | df3191ada890cebe8dd91b983804041bb20a6543 [diff] |
Move NetworkCapabilitiesUtils to framework-common am: ed288807a6 am: 369277cfdf Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8aee6db446615ce53b8f9988e5071d6a65b1e8ef
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index c7a4bd5..c6a17fe 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/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/staticlibs/device/com/android/net/module/util/CollectionUtils.java b/staticlibs/framework/com/android/net/module/util/CollectionUtils.java similarity index 100% rename from staticlibs/device/com/android/net/module/util/CollectionUtils.java rename to staticlibs/framework/com/android/net/module/util/CollectionUtils.java
diff --git a/staticlibs/device/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java similarity index 98% rename from staticlibs/device/com/android/net/module/util/NetworkCapabilitiesUtils.java rename to staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java index dd5a481..5a0200f 100644 --- a/staticlibs/device/com/android/net/module/util/NetworkCapabilitiesUtils.java +++ b/staticlibs/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}.