commit 97874a2f808e1e21f8f1ac2700d11a260c5883ce
author Nate Jiang <qiangjiang@google.com> Thu Jan 28 09:42:02 2021 -0800
committer Nate Jiang <qiangjiang@google.com> Tue Feb 02 20:36:44 2021 -0800
tree 7784511e0584cf772e3cf0ce7edcde007e8b7b0a
parent d3891ff06bfe703143f15f8668fd76cad9a6949c

Fix race condition issue for approval status

Bug: 177877098
Test: atest FrameworksWifiTests
Change-Id: Ia3e06a5482f5ceeace701179a5a7ce52e0b8c74a

framework/api/current.txt

diff --git a/framework/api/current.txt b/framework/api/current.txt
index c1f5322..e908290 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -318,7 +318,7 @@
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int addNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);
     method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
     method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public void addSuggestionConnectionStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean addSuggestionUserApprovalStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener);
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void addSuggestionUserApprovalStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener);
     method @Deprecated public static int calculateSignalLevel(int, int);
     method @IntRange(from=0) public int calculateSignalLevel(int);
     method @Deprecated public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
@@ -334,7 +334,6 @@
     method @Deprecated public android.net.DhcpInfo getDhcpInfo();
     method public int getMaxNumberOfNetworkSuggestionsPerApp();
     method @IntRange(from=0) public int getMaxSignalLevel();
-    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getNetworkSuggestionUserApprovalStatus();
     method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiNetworkSuggestion> getNetworkSuggestions();
     method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
     method public java.util.List<android.net.wifi.ScanResult> getScanResults();
@@ -480,7 +479,7 @@
   }
 
   public static interface WifiManager.SuggestionUserApprovalStatusListener {
-    method public void onUserApprovalStatusChange();
+    method public void onUserApprovalStatusChange(int);
   }
 
   public class WifiManager.WifiLock {