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

Merge "Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()" into nyc-dev

Browse Source
This commit is contained in:
Samuel Tan
2016-04-11 19:54:20 +00:00
committed by Android (Google) Code Review
parent e346335d3c 44a4668b45
commit 49a1c083ad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/IWifiManager.aidl
View File

@@ -149,7 +149,7 @@ interface IWifiManager
void setAllowScansWithTraffic(int enabled);
int getAllowScansWithTraffic();
boolean enableAutoJoinWhenAssociated(boolean enabled);
boolean setEnableAutoJoinWhenAssociated(boolean enabled);
boolean getEnableAutoJoinWhenAssociated();
void enableWifiConnectivityManager(boolean enabled);

4
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -2700,9 +2700,9 @@ public class WifiManager {
* @return true -- if set successful false -- if set failed
* @hide
*/
public boolean enableAutoJoinWhenAssociated(boolean enabled) {
public boolean setEnableAutoJoinWhenAssociated(boolean enabled) {
try {
return mService.enableAutoJoinWhenAssociated(enabled);
return mService.setEnableAutoJoinWhenAssociated(enabled);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}