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

Commit 7a1204ac authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Rename WpsConfiguration to Wps"

parents 20258997 489a9d81

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java/android/media/IAudioService.P)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc/)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

services/java/com/android/server/WifiService.java

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import android.net.wifi.WifiStateMachine; 
import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiWatchdogStateMachine;

import android.net.wifi.WifiConfiguration.KeyMgmt;

import android.net.wifi.WpsConfiguration;

import android.net.wifi.Wps;

import android.net.wifi.WpsResult;

import android.net.ConnectivityManager;

import android.net.DhcpInfo;
@@ -286,7 +286,7 @@ public class WifiService extends IWifiManager.Stub { 
                }

                case WifiManager.CMD_START_WPS: {

                    //replyTo has the original source

                    mWifiStateMachine.startWps(msg.replyTo, (WpsConfiguration)msg.obj);

                    mWifiStateMachine.startWps(msg.replyTo, (Wps)msg.obj);

                    break;

                }

                case WifiManager.CMD_DISABLE_NETWORK: {

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.net.wifi; 


import android.net.wifi.WifiInfo;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WpsConfiguration;

import android.net.wifi.Wps;

import android.net.wifi.WpsResult;

import android.net.wifi.ScanResult;

import android.net.DhcpInfo;

wifi/java/android/net/wifi/WifiConfigStore.java

+4 −4
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ class WifiConfigStore { 
     * Start WPS pin method configuration with pin obtained

     * from the access point

     */

    static WpsResult startWpsWithPinFromAccessPoint(WpsConfiguration config) {

    static WpsResult startWpsWithPinFromAccessPoint(Wps config) {

        WpsResult result = new WpsResult();

        if (WifiNative.startWpsWithPinFromAccessPointCommand(config.BSSID, config.pin)) {

            /* WPS leaves all networks disabled */
@@ -415,7 +415,7 @@ class WifiConfigStore { 
     * from the device

     * @return WpsResult indicating status and pin

     */

    static WpsResult startWpsWithPinFromDevice(WpsConfiguration config) {

    static WpsResult startWpsWithPinFromDevice(Wps config) {

        WpsResult result = new WpsResult();

        result.pin = WifiNative.startWpsWithPinFromDeviceCommand(config.BSSID);

        /* WPS leaves all networks disabled */
@@ -432,7 +432,7 @@ class WifiConfigStore { 
    /**

     * Start WPS push button configuration

     */

    static WpsResult startWpsPbc(WpsConfiguration config) {

    static WpsResult startWpsPbc(Wps config) {

        WpsResult result = new WpsResult();

        if (WifiNative.startWpsPbcCommand(config.BSSID)) {

            /* WPS leaves all networks disabled */
@@ -594,7 +594,7 @@ class WifiConfigStore { 
        sendConfiguredNetworksChangedBroadcast();

    }



    static void updateIpAndProxyFromWpsConfig(int netId, WpsConfiguration wpsConfig) {

    static void updateIpAndProxyFromWpsConfig(int netId, Wps wpsConfig) {

        synchronized (sConfiguredNetworks) {

            WifiConfiguration config = sConfiguredNetworks.get(netId);

            if (config != null) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ public class WifiManager { 
     * @param config WPS configuration

     * @hide

     */

    public void startWps(WpsConfiguration config) {

    public void startWps(Wps config) {

        if (config == null) {

            return;

        }