| commit | 88b345aa4266177b4ced396bd3052e2caf6b59e3 | [log] [tgz] |
|---|---|---|
| author | Nucca Chen <nuccachen@google.com> | Tue Jan 12 08:06:03 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 12 08:06:03 2021 +0000 |
| tree | 40213563e1a2e0aa9e68bf83fbc84859b41a3590 | |
| parent | df3191ada890cebe8dd91b983804041bb20a6543 [diff] | |
| parent | 22bfada06e63f5d23de49f4a9a84b95661359025 [diff] |
Merge "Default write to byte array with native order"
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}.