API feedback changes in WifiP2pConfig

The changes are,

1.  For grammatical correctness, renamed isAuthorizeConnectionFromPeer()
to isAuthorizeConnectionFromPeerEnabled and renamed the setter to
setAuthorizeConnectionFromPeerEnabled.
2. WifiP2pManager.NO_PERMISSION annotated with @IntDef

Bug: 383759306
Flag: com.android.wifi.flags.wifi_direct_r2
Test: Manual - Basic P2P connect/disconnect tests
Test: TH Presubmit tests
Test: atest com.android.server.wifi.p2p
Change-Id: Ib40bc3e0d5dbccd0124f130e6de6d8df04361e37

4 files changed, 31 insertions, 19 deletions

diff --git a/framework/api/current.txt b/framework/api/current.txt
index 41062f1c6b..2ede3b6c00 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -1295,7 +1295,7 @@ package android.net.wifi.p2p {
     method @FlaggedApi("com.android.wifi.flags.wifi_direct_r2") @Nullable public android.net.wifi.p2p.WifiP2pPairingBootstrappingConfig getPairingBootstrappingConfig();
     method @Nullable public String getPassphrase();
     method @FlaggedApi("com.android.wifi.flags.wifi_direct_r2") public int getPccModeConnectionType();
-    method @FlaggedApi("com.android.wifi.flags.wifi_direct_r2") public boolean isAuthorizeConnectionFromPeer();
+    method @FlaggedApi("com.android.wifi.flags.wifi_direct_r2") public boolean isAuthorizeConnectionFromPeerEnabled();
     method @FlaggedApi("com.android.wifi.flags.wifi_direct_r2") public void setGroupOwnerVersion(int);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pConfig> CREATOR;
@@ -1322,7 +1322,7 @@ package android.net.wifi.p2p {
     ctor public WifiP2pConfig.Builder();
     method @NonNull public android.net.wifi.p2p.WifiP2pConfig build();
     method @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder enablePersistentMode(boolean);
-    method @FlaggedApi("com.android.wifi.flags.wifi_direct_r2") @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder setAuthorizeConnectionFromPeer(boolean);
+    method @FlaggedApi("com.android.wifi.flags.wifi_direct_r2") @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder setAuthorizeConnectionFromPeerEnabled(boolean);
     method @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder setDeviceAddress(@Nullable android.net.MacAddress);
     method @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder setGroupClientIpProvisioningMode(int);
     method @NonNull public android.net.wifi.p2p.WifiP2pConfig.Builder setGroupOperatingBand(int);
diff --git a/framework/java/android/net/wifi/p2p/WifiP2pConfig.java b/framework/java/android/net/wifi/p2p/WifiP2pConfig.java
index 67f1e6cd3a..21d524cf8e 100644
--- a/framework/java/android/net/wifi/p2p/WifiP2pConfig.java
+++ b/framework/java/android/net/wifi/p2p/WifiP2pConfig.java
@@ -397,22 +397,22 @@ public class WifiP2pConfig implements Parcelable {
     /**
      * Used to authorize a connection request from the peer device.
      */
-    private boolean mAuthorizeConnectionFromPeer = false;
+    private boolean mIsAuthorizeConnectionFromPeerEnabled = false;
 
     /**
      * Query to check if the configuration is for authorizing a connection request
-     * from the peer device. @see {@link Builder#setAuthorizeConnectionFromPeer(boolean)}
+     * from the peer device. @see {@link Builder#setAuthorizeConnectionFromPeerEnabled(boolean)}
      *
      * @return true if configured to authorize a connection request from the Peer device,
      * False otherwise.
      */
     @RequiresApi(Build.VERSION_CODES.BAKLAVA)
     @FlaggedApi(Flags.FLAG_WIFI_DIRECT_R2)
-    public boolean isAuthorizeConnectionFromPeer() {
+    public boolean isAuthorizeConnectionFromPeerEnabled() {
         if (!Environment.isSdkAtLeastB()) {
             throw new UnsupportedOperationException();
         }
-        return mAuthorizeConnectionFromPeer;
+        return mIsAuthorizeConnectionFromPeerEnabled;
     }
 
     public WifiP2pConfig() {
@@ -498,7 +498,8 @@ public class WifiP2pConfig implements Parcelable {
                     .append((mPairingBootstrappingConfig == null)
                             ? "<null>" : mPairingBootstrappingConfig.toString());
         }
-        sbuf.append("\n authorizeConnectionFromPeer: ").append(mAuthorizeConnectionFromPeer);
+        sbuf.append("\n authorizeConnectionFromPeerEnabled: ")
+                .append(mIsAuthorizeConnectionFromPeerEnabled);
         return sbuf.toString();
     }
 
@@ -523,7 +524,7 @@ public class WifiP2pConfig implements Parcelable {
             mVendorData = new ArrayList<>(source.mVendorData);
             mGroupOwnerVersion = source.mGroupOwnerVersion;
             mPairingBootstrappingConfig = source.mPairingBootstrappingConfig;
-            mAuthorizeConnectionFromPeer = source.mAuthorizeConnectionFromPeer;
+            mIsAuthorizeConnectionFromPeerEnabled = source.mIsAuthorizeConnectionFromPeerEnabled;
         }
     }
 
@@ -544,7 +545,7 @@ public class WifiP2pConfig implements Parcelable {
         if (Environment.isSdkAtLeastB() && Flags.wifiDirectR2()) {
             dest.writeParcelable(mPairingBootstrappingConfig, flags);
         }
-        dest.writeBoolean(mAuthorizeConnectionFromPeer);
+        dest.writeBoolean(mIsAuthorizeConnectionFromPeerEnabled);
     }
 
     /** Implement the Parcelable interface */
@@ -569,7 +570,7 @@ public class WifiP2pConfig implements Parcelable {
                         config.mPairingBootstrappingConfig = in.readParcelable(
                                 WifiP2pPairingBootstrappingConfig.class.getClassLoader());
                     }
-                    config.mAuthorizeConnectionFromPeer = in.readBoolean();
+                    config.mIsAuthorizeConnectionFromPeerEnabled = in.readBoolean();
                     return config;
             }
 
@@ -610,7 +611,7 @@ public class WifiP2pConfig implements Parcelable {
         @PccModeConnectionType
         private int mPccModeConnectionType = PCC_MODE_DEFAULT_CONNECTION_TYPE_LEGACY_ONLY;
         private @Nullable WifiP2pPairingBootstrappingConfig mPairingBootstrappingConfig;
-        private boolean mAuthorizeConnectionFromPeer = false;
+        private boolean mIsAuthorizeConnectionFromPeerEnabled = false;
 
         /**
          * Specify the peer's MAC address. If not set, the device will
@@ -954,15 +955,15 @@ public class WifiP2pConfig implements Parcelable {
          * WifiP2pManager.ActionListener)}. The device will then wait for the connection request
          * from the peer device.
          *
-         * @param authorize true to authorize a connection request from the peer device, false to
+         * @param enabled true to authorize a connection request from the peer device, false to
          *                  let the device join a group or form a group.
          * @return The builder to facilitate chaining {@code builder.setXXX(..).setXXX(..)}.
          */
         @RequiresApi(Build.VERSION_CODES.BAKLAVA)
         @FlaggedApi(Flags.FLAG_WIFI_DIRECT_R2)
         @NonNull
-        public Builder setAuthorizeConnectionFromPeer(boolean authorize) {
-            mAuthorizeConnectionFromPeer = authorize;
+        public Builder setAuthorizeConnectionFromPeerEnabled(boolean enabled) {
+            mIsAuthorizeConnectionFromPeerEnabled = enabled;
             return this;
         }
 
@@ -1017,7 +1018,7 @@ public class WifiP2pConfig implements Parcelable {
             config.mGroupClientIpProvisioningMode = mGroupClientIpProvisioningMode;
             config.mJoinExistingGroup = mJoinExistingGroup;
             config.mPairingBootstrappingConfig = mPairingBootstrappingConfig;
-            config.mAuthorizeConnectionFromPeer = mAuthorizeConnectionFromPeer;
+            config.mIsAuthorizeConnectionFromPeerEnabled = mIsAuthorizeConnectionFromPeerEnabled;
             return config;
         }
     }
diff --git a/framework/java/android/net/wifi/p2p/WifiP2pManager.java b/framework/java/android/net/wifi/p2p/WifiP2pManager.java
index 717bde6a80..1dd495ceec 100644
--- a/framework/java/android/net/wifi/p2p/WifiP2pManager.java
+++ b/framework/java/android/net/wifi/p2p/WifiP2pManager.java
@@ -975,6 +975,17 @@ public class WifiP2pManager {
     @FlaggedApi(Flags.FLAG_WIFI_DIRECT_R2)
     public static final int NO_PERMISSION = 4;
 
+    /** @hide */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef(value = {
+            ERROR,
+            P2P_UNSUPPORTED,
+            BUSY,
+            NO_PERMISSION
+    })
+    public @interface FailureReason{}
+
+
     /** Interface for callback invocation when framework channel is lost */
     public interface ChannelListener {
         /**
@@ -4000,7 +4011,7 @@ public class WifiP2pManager {
          * The operation failed.
          * @param reason The reason for failure.
          */
-        void onFailure(int reason);
+        void onFailure(@FailureReason int reason);
     }
 
     /**
@@ -4064,7 +4075,7 @@ public class WifiP2pManager {
                     }
 
                     @Override
-                    public void onFailure(int reason) {
+                    public void onFailure(@FailureReason int reason) {
                         Binder.clearCallingIdentity();
                         executor.execute(() -> {
                             callback.onError(reasonCodeToException(reason));
diff --git a/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java b/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java
index b11daabac5..cb7df2d6f3 100644
--- a/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java
+++ b/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java
@@ -477,12 +477,12 @@ public class WifiP2pConfigTest {
                 .setDeviceAddress(MacAddress.fromString(DEVICE_ADDRESS))
                 .setPairingBootstrappingConfig(expectedPairingBootstrappingConfig)
                 .setGroupOperatingFrequency(2437)
-                .setAuthorizeConnectionFromPeer(true)
+                .setAuthorizeConnectionFromPeerEnabled(true)
                 .build();
         WifiP2pPairingBootstrappingConfig pairingBootstrappingConfig =
                 c.getPairingBootstrappingConfig();
         assertNotNull(pairingBootstrappingConfig);
         assertEquals(expectedPairingBootstrappingConfig, pairingBootstrappingConfig);
-        assertTrue(c.isAuthorizeConnectionFromPeer());
+        assertTrue(c.isAuthorizeConnectionFromPeerEnabled());
     }
 }