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 "Expose getCapabilities" am: 0f441f7bdd am: e988cf4321

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

Change-Id: I5a7df27d7b6f7eca0364c3d88d4ad8663063cb3e
This commit is contained in:
Lucas Lin 2021-03-19 11:07:40 +00:00 • committed by Automerger Merge Worker
commit bf42eae162
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
framework/api/current.txt
View file

@ -291,6 +291,7 @@ package android.net {
ctor public NetworkCapabilities(); ctor public NetworkCapabilities();
ctor public NetworkCapabilities(android.net.NetworkCapabilities); ctor public NetworkCapabilities(android.net.NetworkCapabilities);
method public int describeContents(); method public int describeContents();
method @NonNull public int[] getCapabilities();
method public int getLinkDownstreamBandwidthKbps(); method public int getLinkDownstreamBandwidthKbps();
method public int getLinkUpstreamBandwidthKbps(); method public int getLinkUpstreamBandwidthKbps();
method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier(); method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();

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

@ -609,10 +609,8 @@ public final class NetworkCapabilities implements Parcelable {
* Gets all the capabilities set on this {@code NetworkCapability} instance. * Gets all the capabilities set on this {@code NetworkCapability} instance.
* *
* @return an array of capability values for this instance. * @return an array of capability values for this instance.
* @hide
*/ */
@UnsupportedAppUsage public @NonNull @NetCapability int[] getCapabilities() {
public @NetCapability int[] getCapabilities() {
return NetworkCapabilitiesUtils.unpackBits(mNetworkCapabilities); return NetworkCapabilitiesUtils.unpackBits(mNetworkCapabilities);
} }