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

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

Merge "Use renamed Wps class"

parents 491af080 66892002

src/com/android/settings/wifi/WifiConfigController.java

+4 −4
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ import android.net.wifi.WifiConfiguration.KeyMgmt; 
import android.net.wifi.WifiConfiguration.ProxySettings;

import android.net.wifi.WifiConfiguration.Status;

import android.net.wifi.WifiInfo;

import android.net.wifi.WpsConfiguration;

import android.net.wifi.WpsConfiguration.Setup;

import android.net.wifi.Wps;

import android.net.wifi.Wps.Setup;

import android.security.Credentials;

import android.security.KeyStore;

import android.text.Editable;
@@ -484,8 +484,8 @@ public class WifiConfigController implements TextWatcher, 
        return MANUAL;

    }



    WpsConfiguration getWpsConfig() {

        WpsConfiguration config = new WpsConfiguration();

    Wps getWpsConfig() {

        Wps config = new Wps();

        switch (mNetworkSetupSpinner.getSelectedItemPosition()) {

            case WPS_PBC:

                config.setup = Setup.PBC;

src/com/android/settings/wifi/p2p/WifiP2pDialog.java

+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.settings.wifi.p2p; 
import android.app.AlertDialog;

import android.content.Context;

import android.content.DialogInterface;

import android.net.wifi.WpsConfiguration;

import android.net.wifi.WpsConfiguration.Setup;

import android.net.wifi.Wps;

import android.net.wifi.Wps.Setup;

import android.net.wifi.p2p.WifiP2pConfig;

import android.net.wifi.p2p.WifiP2pDevice;

import android.os.Bundle;
@@ -64,7 +64,7 @@ public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSele 
    public WifiP2pConfig getConfig() {

        WifiP2pConfig config = new WifiP2pConfig();

        config.deviceAddress = mDeviceAddress.getText().toString();

        config.wpsConfig = new WpsConfiguration();

        config.wpsConfig = new Wps();

        switch (mWpsSetupIndex) {

            case WPS_PBC:

                config.wpsConfig.setup = Setup.PBC;