| commit | 2435d5a7876b40eba3bbfa97f6a13284907c8c94 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Tue Apr 06 17:36:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 17:36:58 2021 +0000 |
| tree | 6e7318d6aab34504b78bf0e11a470ea147a6f577 | |
| parent | 537e4415b1f67a72ccd60f3b0e74a07308f3ae9d [diff] | |
| parent | 5a76723653f95b828ccb4e9132ee0d0fb99e30a4 [diff] |
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183 am: 5a76723653 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151 Change-Id: If4d2d06c0e3ca6793dcb6139d3cd197e33f5aab7
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) {