Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6d7bf81 authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "NetworkCapabilities: Hide copy constructor" am: 8662d38f am:... 

Merge "NetworkCapabilities: Hide copy constructor" am: 8662d38f am: aa9a283f am: b142a134 am: 80da2e1c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151

Change-Id: Ibe3f00c6b9b84dfe89298957d80b2cfe69fe5d3d
parents d8ac0de6 80da2e1c

packages/Connectivity/framework/api/module-lib-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+0 −1
Original line number Diff line number Diff line
@@ -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) {