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 
am: 49a1c08

* commit '49a1c083addc8cb489a0fad0bd14c795062ecb02':
  Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()

Change-Id: I8dbd7a649b21a86257daf535274cfa52883e8257
This commit is contained in:
Samuel Tan
2016-04-11 19:59:08 +00:00
committed by android-build-merger
parent 009f5cd591 49a1c083ad
commit e760bc7c54
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); void setAllowScansWithTraffic(int enabled);
int getAllowScansWithTraffic(); int getAllowScansWithTraffic();
boolean enableAutoJoinWhenAssociated(boolean enabled); boolean setEnableAutoJoinWhenAssociated(boolean enabled);
boolean getEnableAutoJoinWhenAssociated(); boolean getEnableAutoJoinWhenAssociated();
void enableWifiConnectivityManager(boolean enabled); 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 * @return true -- if set successful false -- if set failed
* @hide * @hide
*/ */
public boolean enableAutoJoinWhenAssociated(boolean enabled) { public boolean setEnableAutoJoinWhenAssociated(boolean enabled) {
try { try {
return mService.enableAutoJoinWhenAssociated(enabled); return mService.setEnableAutoJoinWhenAssociated(enabled);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }