commit ce0efe0ac74358c769b96580b193491003b58956
author Nate Jiang <qiangjiang@google.com> Wed Jan 25 11:22:38 2023 -0800
committer Nate(Qiang) Jiang <qiangjiang@google.com> Thu Jan 26 17:40:37 2023 +0000
tree b1784147284141f76e3807ef52bc12f10e75f923
parent 249b8c38514e83f35ff5b65436f5931f1d7c18c3

Change API name according to the feedback

API-Coverage-Bug: 263295618
Bug: 265913958
Test: atest android.net.wifi
Change-Id: I38bf4d71293e26a23d14ddf7b6ca8f099d4806eb

framework/api/current.txt

diff --git a/framework/api/current.txt b/framework/api/current.txt
index a48840f..896e950 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -869,20 +869,24 @@
     method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierOpen(@NonNull android.net.wifi.aware.PeerHandle);
     method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(@NonNull android.net.wifi.aware.PeerHandle, @NonNull String);
     method public void initiateBootstrappingRequest(@NonNull android.net.wifi.aware.PeerHandle, int);
-    method public void initiatePairingRequest(@NonNull android.net.wifi.aware.PeerHandle, @Nullable String, @NonNull String);
-    method public void respondToPairingRequest(int, @NonNull android.net.wifi.aware.PeerHandle, boolean, @Nullable String, @Nullable String);
+    method public void initiatePairingRequest(@NonNull android.net.wifi.aware.PeerHandle, @NonNull String, @Nullable String);
+    method public void rejectPairingRequest(int, @NonNull android.net.wifi.aware.PeerHandle);
+    method public void respondToPairingRequest(int, @NonNull android.net.wifi.aware.PeerHandle, @NonNull String, @Nullable String);
     method public void sendMessage(@NonNull android.net.wifi.aware.PeerHandle, int, @Nullable byte[]);
   }
 
   public class DiscoverySessionCallback {
     ctor public DiscoverySessionCallback();
-    method public void onBootstrappingConfirmed(@NonNull android.net.wifi.aware.PeerHandle, boolean, int);
+    method public void onBootstrappingMethodFailure(@NonNull android.net.wifi.aware.PeerHandle);
+    method public void onBootstrappingSuccess(@NonNull android.net.wifi.aware.PeerHandle, boolean, int);
     method public void onMessageReceived(android.net.wifi.aware.PeerHandle, byte[]);
     method public void onMessageSendFailed(int);
     method public void onMessageSendSucceeded(int);
-    method public void onPairingSetupConfirmed(@NonNull android.net.wifi.aware.PeerHandle, boolean, @Nullable String);
+    method public void onPairingSetupFailure(@NonNull android.net.wifi.aware.PeerHandle);
     method public void onPairingSetupRequestReceived(@NonNull android.net.wifi.aware.PeerHandle, int);
-    method public void onPairingVerificationConfirmed(@NonNull android.net.wifi.aware.PeerHandle, boolean, @Nullable String);
+    method public void onPairingSetupSuccess(@NonNull android.net.wifi.aware.PeerHandle, @NonNull String);
+    method public void onPairingVerificationFailure(@NonNull android.net.wifi.aware.PeerHandle);
+    method public void onPairingVerificationSuccess(@NonNull android.net.wifi.aware.PeerHandle, @NonNull String);
     method public void onPublishStarted(@NonNull android.net.wifi.aware.PublishDiscoverySession);
     method public void onServiceDiscovered(android.net.wifi.aware.PeerHandle, byte[], java.util.List<byte[]>);
     method public void onServiceDiscovered(@NonNull android.net.wifi.aware.ServiceDiscoveryInfo);
@@ -1016,7 +1020,7 @@
     method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void attach(@NonNull android.net.wifi.aware.AttachCallback, @NonNull android.net.wifi.aware.IdentityChangedListener, @Nullable android.os.Handler);
     method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.aware.AwareResources getAvailableAwareResources();
     method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.aware.Characteristics getCharacteristics();
-    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void getPairedDevice(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<java.lang.String>>);
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void getPairedDevices(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<java.lang.String>>);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isAvailable();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isDeviceAttached();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isInstantCommunicationModeEnabled();