Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: correct API name" into rvc-dev

Browse Source
This commit is contained in:
Les Lee
2020-02-24 15:29:21 +00:00
committed by Android (Google) Code Review
parent 025b96ee57 7a0c18c884
commit 14ebab3b19
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -7199,9 +7199,9 @@ package android.net.wifi {
} }
public final class SoftApCapability implements android.os.Parcelable { public final class SoftApCapability implements android.os.Parcelable {
method public boolean areFeaturesSupported(long);
method public int describeContents(); method public int describeContents();
method public int getMaxSupportedClients(); method public int getMaxSupportedClients();
method public boolean isFeatureSupported(long);
method public void writeToParcel(@NonNull android.os.Parcel, int); method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApCapability> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApCapability> CREATOR;
field public static final long SOFTAP_FEATURE_ACS_OFFLOAD = 1L; // 0x1L field public static final long SOFTAP_FEATURE_ACS_OFFLOAD = 1L; // 0x1L

10
wifi/java/android/net/wifi/SoftApCapability.java
View File

@@ -100,12 +100,12 @@ public final class SoftApCapability implements Parcelable {
} }
/** /**
* Returns true when feature supported, otherwise false. * Returns true when all of the queried features are supported, otherwise false.
* *
* @param feature one of feature from {@link HotspotFeatures} * @param features One or combination of the features from {@link @HotspotFeatures}
*/ */
public boolean isFeatureSupported(@HotspotFeatures long feature) { public boolean areFeaturesSupported(@HotspotFeatures long features) {
return (mSupportedFeatures & feature) == feature; return (mSupportedFeatures & features) == features;
} }
/** /**
@@ -122,7 +122,7 @@ public final class SoftApCapability implements Parcelable {
* Constructor with combination of the feature. * Constructor with combination of the feature.
* Zero to no supported feature. * Zero to no supported feature.
* *
* @param features One or combination of the feature from {@link @HotspotFeatures}. * @param features One or combination of the features from {@link @HotspotFeatures}.
* @hide * @hide
*/ */
public SoftApCapability(@HotspotFeatures long features) { public SoftApCapability(@HotspotFeatures long features) {

7
wifi/java/android/net/wifi/SoftApConfiguration.java
View File

@@ -762,7 +762,8 @@ public final class SoftApConfiguration implements Parcelable {
* {@link #setBand(@BandType int)}. * {@link #setBand(@BandType int)}.
* *
* The channel auto selection will offload to driver when * The channel auto selection will offload to driver when
* {@link SoftApCapability#isFeatureSupported(SoftApCapability.SOFTAP_FEATURE_ACS_OFFLOAD)} * {@link SoftApCapability#areFeaturesSupported(
* SoftApCapability.SOFTAP_FEATURE_ACS_OFFLOAD)}
* return true. Driver will auto select best channel which based on environment * return true. Driver will auto select best channel which based on environment
* interference to get best performance. Check {@link SoftApCapability} to get more detail. * interference to get best performance. Check {@link SoftApCapability} to get more detail.
* *
@@ -807,7 +808,7 @@ public final class SoftApConfiguration implements Parcelable {
* *
* <p> * <p>
* Use {@link WifiManager.SoftApCallback#onCapabilityChanged(SoftApCapability)} and * Use {@link WifiManager.SoftApCallback#onCapabilityChanged(SoftApCapability)} and
* {@link SoftApCapability#isFeatureSupported(int)} * {@link SoftApCapability#areFeaturesSupported(int)}
* with {@link SoftApCapability.SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT} to determine whether * with {@link SoftApCapability.SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT} to determine whether
* or not this feature is supported. * or not this feature is supported.
* *
@@ -882,7 +883,7 @@ public final class SoftApConfiguration implements Parcelable {
* <p> * <p>
* This method requires hardware support. Hardware support can be determined using * This method requires hardware support. Hardware support can be determined using
* {@link WifiManager.SoftApCallback#onCapabilityChanged(SoftApCapability)} and * {@link WifiManager.SoftApCallback#onCapabilityChanged(SoftApCapability)} and
* {@link SoftApCapability#isFeatureSupported(int)} * {@link SoftApCapability#areFeaturesSupported(int)}
* with {@link SoftApCapability.SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT} * with {@link SoftApCapability.SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT}
* *
* <p> * <p>