diff options
| author | 2021-04-06 18:25:52 +0000 | |
|---|---|---|
| committer | 2021-04-06 18:25:52 +0000 | |
| commit | 80da2e1cbacfedb0f3607e6d40445e47715ea594 (patch) | |
| tree | cc6fc548c5655af642f1354f2dadf4cf4992384b | |
| parent | 0908b0d8d34f911086b29e94402d670bcb42b6f4 (diff) | |
| parent | b142a134bec67cabfa30d8254b98150d327ddf61 (diff) | |
Merge "NetworkCapabilities: Hide copy constructor" am: 8662d38f83 am: aa9a283fc8 am: b142a134be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151
Change-Id: Ia04c6e313a5c960c4874cd57cf91c6619d1505da
| -rw-r--r-- | packages/Connectivity/framework/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/NetworkCapabilities.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/packages/Connectivity/framework/api/module-lib-current.txt b/packages/Connectivity/framework/api/module-lib-current.txt index 20655592276e..513b6308f372 100644 --- a/packages/Connectivity/framework/api/module-lib-current.txt +++ b/packages/Connectivity/framework/api/module-lib-current.txt @@ -107,7 +107,6 @@ package android.net { } 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/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java index a54696fd5d4a..9c4c0e2e4ca0 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java +++ b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java @@ -162,7 +162,6 @@ public final class NetworkCapabilities implements Parcelable { * {@link NetworkCapabilities}. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public NetworkCapabilities(@Nullable NetworkCapabilities nc, @RedactionType long redactions) { mRedactions = redactions; if (nc != null) { |