Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f"
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 3674f0f..706b294 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -133,14 +133,8 @@
void setWifiApConfiguration(in WifiConfiguration wifiConfig);
- void addToBlacklist(String bssid);
-
- void clearBlacklist();
-
Messenger getWifiServiceMessenger();
- String getConfigFile();
-
void enableTdls(String remoteIPAddress, boolean enable);
void enableTdlsWithMacAddress(String remoteMacAddress, boolean enable);
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 19ecbdb..955161c 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1616,41 +1616,6 @@
}
/**
- * Add a bssid to the supplicant blacklist
- *
- * This API is used by WifiWatchdogService
- *
- * @return {@code true} if the operation succeeds else {@code false}
- * @hide
- */
- public boolean addToBlacklist(String bssid) {
- try {
- mService.addToBlacklist(bssid);
- return true;
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
- }
- }
-
- /**
- * Clear the supplicant blacklist
- *
- * This API is used by WifiWatchdogService
- *
- * @return {@code true} if the operation succeeds else {@code false}
- * @hide
- */
- public boolean clearBlacklist() {
- try {
- mService.clearBlacklist();
- return true;
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
- }
- }
-
-
- /**
* Enable/Disable TDLS on a specific local route.
*
* <p>
@@ -2148,18 +2113,6 @@
/**
- * Returns the file in which IP and proxy configuration data is stored
- * @hide
- */
- public String getConfigFile() {
- try {
- return mService.getConfigFile();
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
- }
- }
-
- /**
* Allows an application to keep the Wi-Fi radio awake.
* Normally the Wi-Fi radio may turn off when the user has not used the device in a while.
* Acquiring a WifiLock will keep the radio on until the lock is released. Multiple