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

Commit b1c88ecf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update hidden WifiManager API."

parents 9e38abd1 e50a607a

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

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ interface IWifiManager 


    void enableTdlsWithMacAddress(String remoteMacAddress, boolean enable);



    String getWpsNfcConfigurationToken(int netId);

    String getCurrentNetworkWpsNfcConfigurationToken();



    void enableVerboseLogging(int verbose);

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

+5 −5
Original line number Diff line number Diff line
@@ -1437,15 +1437,15 @@ public class WifiManager { 
    }



    /**

     * Creates a configuration token describing the network referenced by {@code netId}

     * of MIME type application/vnd.wfa.wsc. Can be used to configure WiFi networks via NFC.

     * Creates a configuration token describing the current network of MIME type

     * application/vnd.wfa.wsc. Can be used to configure WiFi networks via NFC.

     *

     * @return hex-string encoded configuration token

     * @return hex-string encoded configuration token or null if there is no current network

     * @hide

     */

    public String getWpsNfcConfigurationToken(int netId) {

    public String getCurrentNetworkWpsNfcConfigurationToken() {

        try {

            return mService.getWpsNfcConfigurationToken(netId);

            return mService.getCurrentNetworkWpsNfcConfigurationToken();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }