| commit | 0392d9c63daa6cd5bde181f81f5f1e6b4bfb6bc8 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Tue Apr 06 18:25:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 18:25:52 2021 +0000 |
| tree | 3a82c997401c4e346b68b67ad48f7af7542f27d8 | |
| parent | 00a45d40b06832791d290daf28ae4973f8456d03 [diff] | |
| parent | c768b86db0ebef39f94bdfef556b7a7815bc1f44 [diff] |
Merge "NetworkCapabilities: Hide copy constructor" am: fb309ae283 am: afd7250ef7 am: c768b86db0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151 Change-Id: Ia04c6e313a5c960c4874cd57cf91c6619d1505da
diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt index 2065559..513b630 100644 --- a/framework/api/module-lib-current.txt +++ b/framework/api/module-lib-current.txt
@@ -107,7 +107,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 a54696f..9c4c0e2 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java
@@ -162,7 +162,6 @@ * {@link NetworkCapabilities}. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public NetworkCapabilities(@Nullable NetworkCapabilities nc, @RedactionType long redactions) { mRedactions = redactions; if (nc != null) {