commit | 62dd88e94409aa99187c5425bf735e56b8cb93c6 | [log] [tgz] |
---|---|---|
author | Lucas Lin <lucaslin@google.com> | Mon Jan 11 01:49:12 2021 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 11 01:49:12 2021 +0000 |
tree | f3a2725c9186ab85076d379f5a355fc8e9fc4ce3 | |
parent | ed288807a6e34d3413377d4f414788d78c6f964e [diff] | |
parent | 00edc1308d7e6f0dcf695173a79556f9a6f4313d [diff] |
Merge "Have a new library - netd-client in frameworks/libs/net"
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}.