From 651faf76100e45e163e742d06bdecf908ccfb62d Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Wed, 24 Mar 2021 22:40:37 +0900
Subject: [PATCH] Add visibility to net-utils-framework-srcs

Allow framework-connectivity to depend on net-utils-framework-srcs, and
add @hide annotations to classes that were missing it.

This allows depending on less classes than net-utils-device-common, and
avoids transitive dependency on androidx.annotations used by
net-utils-device-common (which itself depends on the public SDK).

Bug: 183600168
Test: m
Merged-In: I89a18bb46311800fd6807dad5785f12648f165d9
Change-Id: I4c37d78198682366f56cde1b2707b0323f2f9e40
---
 staticlibs/Android.bp                                        | 5 ++++-
 .../com/android/net/module/util/CollectionUtils.java         | 1 +
 .../com/android/net/module/util/ConnectivityUtils.java       | 1 +
 .../android/net/module/util/NetworkCapabilitiesUtils.java    | 1 +
 .../com/android/net/module/util/NetworkIdentityUtils.java    | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index ec36608794..4810a647ac 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -83,7 +83,10 @@ filegroup {
     name: "net-utils-framework-common-srcs",
     srcs: ["framework/**/*.java"],
     path: "framework",
-    visibility: ["//frameworks/base"],
+    visibility: [
+        "//frameworks/base",
+        "//frameworks/base/packages/Connectivity/framework",
+    ],
 }
 
 java_library {
diff --git a/staticlibs/framework/com/android/net/module/util/CollectionUtils.java b/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
index 4fce8f50e4..0696cca897 100644
--- a/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
@@ -27,6 +27,7 @@ import java.util.function.Predicate;
 
 /**
  * Utilities for {@link Collection} and arrays.
+ * @hide
  */
 public final class CollectionUtils {
     private CollectionUtils() {}
diff --git a/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java b/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java
index 382912bf8d..c135e46643 100644
--- a/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java
@@ -24,6 +24,7 @@ import java.net.InetAddress;
 
 /**
  * Various utilities used in connectivity code.
+ * @hide
  */
 public final class ConnectivityUtils {
     private ConnectivityUtils() {}
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index 4c7d675ef7..552ab21f13 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -44,6 +44,7 @@ import com.android.internal.annotations.VisibleForTesting;
 
 /**
  * Utilities to examine {@link android.net.NetworkCapabilities}.
+ * @hide
  */
 public final class NetworkCapabilitiesUtils {
     // Transports considered to classify networks in UI, in order of which transport should be
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java
index 94e60178fc..b641753c03 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java
@@ -21,6 +21,7 @@ import android.annotation.Nullable;
 
 /**
  * Utilities to examine {@link android.net.NetworkIdentity}.
+ * @hide
  */
 public class NetworkIdentityUtils {
     /**