Snap for 6405781 from a9e12249f4f432270d4665136568f0316da35b3d to sdk-release
Change-Id: I1dfec15f6ccfd739464a8307894d017eab380435
diff --git a/common/Android.bp b/common/Android.bp
index 8f845bc..d29ba36 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -23,9 +23,14 @@
// rules file. Otherwise, it will end up on the boot classpath and other modules will not be able
// to provide their own copy.
+// Note: all filegroups here must have the right path attribute because otherwise, if they are
+// included in the bootclasspath, they could incorrectly be included in the SDK documentation even
+// though they are not in the current.txt files.
+
filegroup {
name: "net-utils-framework-common-srcs",
srcs: ["src_frameworkcommon/**/*.java"],
+ path: "src_frameworkcommon",
visibility: ["//frameworks/base"],
}
@@ -74,6 +79,7 @@
// Any class here *must* have a corresponding jarjar rule in the telephony build rules.
"src_servicescommon/android/net/NetworkFactory.java",
],
+ path: "src_servicescommon",
visibility: [
"//frameworks/opt/telephony",
],
@@ -88,6 +94,7 @@
"src_frameworkcommon/android/net/util/nsd/DnsSdTxtRecord.java",
"src_frameworkcommon/android/net/util/MacAddressUtils.java",
],
+ path: "src_frameworkcommon",
visibility: [
"//frameworks/base",
],
diff --git a/common/src_frameworkcommon/android/net/util/IpRange.java b/common/src_frameworkcommon/android/net/util/IpRange.java
index 04e9277..099770b 100644
--- a/common/src_frameworkcommon/android/net/util/IpRange.java
+++ b/common/src_frameworkcommon/android/net/util/IpRange.java
@@ -39,6 +39,8 @@
*
* <p>Conversion to prefixes are deterministic, and will always return the same set of {@link
* IpPrefix}(es). Ordering of IpPrefix instances is not guaranteed.
+ *
+ * @hide
*/
public final class IpRange {
private static final int SIGNUM_POSITIVE = 1;
diff --git a/common/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java b/common/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
index 8123826..282fa10 100644
--- a/common/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
+++ b/common/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
@@ -33,6 +33,7 @@
/**
* Collection of link properties utilities.
+ * @hide
*/
public final class LinkPropertiesUtils {
diff --git a/common/src_frameworkcommon/android/net/util/MacAddressUtils.java b/common/src_frameworkcommon/android/net/util/MacAddressUtils.java
index 3ad452b..969d127 100644
--- a/common/src_frameworkcommon/android/net/util/MacAddressUtils.java
+++ b/common/src_frameworkcommon/android/net/util/MacAddressUtils.java
@@ -27,6 +27,7 @@
/**
* Collection of MAC address utilities.
+ * @hide
*/
public final class MacAddressUtils {
diff --git a/common/src_frameworkcommon/android/net/util/NetUtils.java b/common/src_frameworkcommon/android/net/util/NetUtils.java
index e006590..302119e 100644
--- a/common/src_frameworkcommon/android/net/util/NetUtils.java
+++ b/common/src_frameworkcommon/android/net/util/NetUtils.java
@@ -27,6 +27,7 @@
/**
* Collection of network common utilities.
+ * @hide
*/
public final class NetUtils {
diff --git a/common/src_servicescommon/android/net/NetworkFactory.java b/common/src_servicescommon/android/net/NetworkFactory.java
index 252c2ea..06399f8 100644
--- a/common/src_servicescommon/android/net/NetworkFactory.java
+++ b/common/src_servicescommon/android/net/NetworkFactory.java
@@ -319,7 +319,7 @@
&& (n.score < mScore || n.providerId == mProvider.getProviderId())
// If this factory can't satisfy the capability needs of this request, then it
// should not be tracked.
- && n.request.satisfiedBy(mCapabilityFilter)
+ && n.request.canBeSatisfiedBy(mCapabilityFilter)
// Finally if the concrete implementation of the factory rejects the request, then
// don't track it.
&& acceptRequest(n.request, n.score);
@@ -335,7 +335,7 @@
// - This factory can't satisfy the capability needs of the request
// - The concrete implementation of the factory rejects the request
&& ((n.score > mScore && n.providerId != mProvider.getProviderId())
- || !n.request.satisfiedBy(mCapabilityFilter)
+ || !n.request.canBeSatisfiedBy(mCapabilityFilter)
|| !acceptRequest(n.request, n.score));
}
