joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: ade4218f81 am: 952d747c72

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2b32d56b4a00608b226c1d9b87b4e5b7818bd86
This commit is contained in:
Frank Li 2021-02-16 04:13:05 +00:00 • committed by Automerger Merge Worker
commit a4ecb7bc72
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
framework/src/android/net/NetworkCapabilities.java
View file

@ -2085,9 +2085,10 @@ public final class NetworkCapabilities implements Parcelable {
/**
* Check if private dns is broken.
*
* @return {@code true} if {@code mPrivateDnsBroken} is set when private DNS is broken.
* @return {@code true} if private DNS is broken on this network.
* @hide
*/
@SystemApi
public boolean isPrivateDnsBroken() {
return mPrivateDnsBroken;
}
@ -2329,6 +2330,17 @@ public final class NetworkCapabilities implements Parcelable {
return this;
}
/**
* Completely clears the contents of this object, removing even the capabilities that are
* set by default when the object is constructed.
* @return this builder
*/
@NonNull
public Builder clearAll() {
mCaps.clearAll();
return this;
}
/**
* Sets the owner UID.
*