Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e760bc7c authored by Samuel Tan's avatar Samuel Tan Committed by android-build-merger
Browse files

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

am: 49a1c083

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

Change-Id: I8dbd7a649b21a86257daf535274cfa52883e8257
parents 009f5cd5 49a1c083

wifi/java/android/net/wifi/IWifiManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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);

wifi/java/android/net/wifi/WifiManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

        }