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

p2p: add annotation for WifiP2pConfig.Builder public API

Browse Source 
Bug: 126614191
Bug: 126700789
Test: Unit tests - atest FrameworksWifiTests
Test: Unit tests - atest FrameworksWifiApiTests
Change-Id: Ib47a1a6d7b72977d22c8402a6229de9a631d728e
This commit is contained in:
Jimmy Chen
2019-03-04 15:09:54 +08:00
parent baf7cd3620
commit ff1bb349ff
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -30419,9 +30419,9 @@ package android.net.wifi.p2p {
public static final class WifiP2pConfig.Builder {
ctor public WifiP2pConfig.Builder();
method public android.net.wifi.p2p.WifiP2pConfig build();
method public android.net.wifi.p2p.WifiP2pConfig.Builder enablePersistentMode(boolean);
method public android.net.wifi.p2p.WifiP2pConfig.Builder setDeviceAddress(android.net.MacAddress);
method @NonNull public android.net.wifi.p2p.WifiP2pConfig build();
method @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder enablePersistentMode(boolean);
method @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder setDeviceAddress(@Nullable android.net.MacAddress);
method public android.net.wifi.p2p.WifiP2pConfig.Builder setGroupOperatingBand(int);
method public android.net.wifi.p2p.WifiP2pConfig.Builder setGroupOperatingFrequency(int);
method public android.net.wifi.p2p.WifiP2pConfig.Builder setNetworkName(String);

8
wifi/java/android/net/wifi/p2p/WifiP2pConfig.java
View File

@@ -17,6 +17,8 @@
package android.net.wifi.p2p;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.net.MacAddress;
import android.net.wifi.WpsInfo;
@@ -240,7 +242,7 @@ public class WifiP2pConfig implements Parcelable {
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
public Builder setDeviceAddress(MacAddress deviceAddress) {
public @NonNull Builder setDeviceAddress(@Nullable MacAddress deviceAddress) {
if (deviceAddress == null) {
mDeviceAddress = MAC_ANY_ADDRESS;
} else {
@@ -391,7 +393,7 @@ public class WifiP2pConfig implements Parcelable {
* @return The builder to facilitate chaining
* {@code builder.setXXX(..).setXXX(..)}.
*/
public Builder enablePersistentMode(boolean persistent) {
public @NonNull Builder enablePersistentMode(boolean persistent) {
if (persistent) {
mNetId = WifiP2pGroup.PERSISTENT_NET_ID;
} else {
@@ -404,7 +406,7 @@ public class WifiP2pConfig implements Parcelable {
* Build {@link WifiP2pConfig} given the current requests made on the builder.
* @return {@link WifiP2pConfig} constructed based on builder method calls.
*/
public WifiP2pConfig build() {
public @NonNull WifiP2pConfig build() {
if (TextUtils.isEmpty(mNetworkName)) {
throw new IllegalStateException(
"network name must be non-empty.");