| commit | afd7250ef7ae0bbce3645d57822a7c914fc298f5 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Tue Apr 06 16:49:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 16:49:29 2021 +0000 |
| tree | 010a36b6517b78bce2d37dcffc9a29603f954fca | |
| parent | b707122936769dbeecef36ef98b1278d4487b0af [diff] | |
| parent | fb309ae283883853ec27eff5e3d6a1204fca89bc [diff] |
Merge "NetworkCapabilities: Hide copy constructor" am: fb309ae283 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151 Change-Id: I4e3b8ca8158102bf71b6ab2ca796bdfeeedd7d55
diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt index f2f5c1b..f95d377 100644 --- a/framework/api/module-lib-current.txt +++ b/framework/api/module-lib-current.txt
@@ -104,7 +104,6 @@ } public final class NetworkCapabilities implements android.os.Parcelable { - ctor public NetworkCapabilities(@Nullable android.net.NetworkCapabilities, long); method @Nullable public java.util.Set<android.util.Range<java.lang.Integer>> getUids(); method public boolean hasUnwantedCapability(int); field public static final long REDACT_ALL = -1L; // 0xffffffffffffffffL
diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index d39f4fb..0619bbd 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java
@@ -163,7 +163,6 @@ * {@link NetworkCapabilities}. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public NetworkCapabilities(@Nullable NetworkCapabilities nc, @RedactionType long redactions) { mRedactions = redactions; if (nc != null) {