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

Commit 51c53a94 authored by Rebecca Silberstein's avatar Rebecca Silberstein
Browse files

WifiManager: delete the setWifiApEnabled method 

Delete the @removed setWifiApEnabled call along with any remaining
callers.

Bug: 66917593
Bug: 26753849
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ieefc59e01d801d9f5a943830c66c86e9e624158c
parent 6c88a3ec

api/system-removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ package android.net.wifi { 
    method public deprecated java.util.List<android.net.wifi.BatchedScanResult> getBatchedScanResults();

    method public android.net.wifi.WifiConnectionStatistics getConnectionStatistics();

    method public deprecated boolean isBatchedScanSupported();

    method public deprecated boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);

    method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource);

  }

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerStressTestRunner.java

+1 −10
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.os.Bundle; 
import android.test.InstrumentationTestRunner;

import android.test.InstrumentationTestSuite;



import com.android.connectivitymanagertest.stress.WifiApStress;

import com.android.connectivitymanagertest.stress.WifiStressTest;



import junit.framework.TestSuite;
@@ -35,7 +34,7 @@ import junit.framework.TestSuite; 
 */



public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunner {

    private int mSoftApIterations = 100;

    private int mSoftApIterations = 0;

    private int mScanIterations = 100;

    private int mReconnectIterations = 100;

    // sleep time before restart wifi, default is set to 2 minutes
@@ -47,7 +46,6 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn 
    @Override

    public TestSuite getAllTests() {

        TestSuite suite = new InstrumentationTestSuite(this);

        suite.addTestSuite(WifiApStress.class);

        suite.addTestSuite(WifiStressTest.class);

        return suite;

    }
@@ -60,13 +58,6 @@ public class ConnectivityManagerStressTestRunner extends InstrumentationTestRunn 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        String valueStr = icicle.getString("softap_iterations");

        if (valueStr != null) {

            int iteration = Integer.parseInt(valueStr);

            if (iteration > 0) {

                mSoftApIterations = iteration;

            }

        }



        String scanIterationStr = icicle.getString("scan_iterations");

        if (scanIterationStr != null) {

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java

+0 −6
Original line number Diff line number Diff line
@@ -129,12 +129,6 @@ public class ConnectivityManagerTestBase extends InstrumentationTestCase { 
        // Get an instance of WifiManager

        mWifiManager =(WifiManager)mContext.getSystemService(Context.WIFI_SERVICE);



        if (mWifiManager.isWifiApEnabled()) {

            // if soft AP is enabled, disable it

            mWifiManager.setWifiApEnabled(null, false);

            logv("Disable soft ap");

        }



        // register a connectivity receiver for CONNECTIVITY_ACTION;

        mConnectivityReceiver = new ConnectivityReceiver();

        mContext.registerReceiver(mConnectivityReceiver,

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerUnitTestRunner.java

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.connectivitymanagertest; 
import android.test.InstrumentationTestRunner;

import android.test.InstrumentationTestSuite;

import com.android.connectivitymanagertest.unit.WifiClientTest;

import com.android.connectivitymanagertest.unit.WifiSoftAPTest;



import junit.framework.TestSuite;
@@ -35,7 +34,6 @@ public class ConnectivityManagerUnitTestRunner extends InstrumentationTestRunner 
    public TestSuite getAllTests() {

        TestSuite suite = new InstrumentationTestSuite(this);

        suite.addTestSuite(WifiClientTest.class);

        suite.addTestSuite(WifiSoftAPTest.class);

        return suite;

    }

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiApStress.java

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.connectivitymanagertest.stress;





import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiConfiguration.AuthAlgorithm;

import android.net.wifi.WifiConfiguration.KeyMgmt;

import android.net.wifi.WifiManager;

import android.os.Environment;

import android.test.suitebuilder.annotation.LargeTest;



import com.android.connectivitymanagertest.ConnectivityManagerStressTestRunner;

import com.android.connectivitymanagertest.ConnectivityManagerTestBase;



import java.io.BufferedWriter;

import java.io.File;

import java.io.FileWriter;



/**

 * Stress test setting up device as wifi hotspot

 */

public class WifiApStress extends ConnectivityManagerTestBase {

    private static String NETWORK_ID = "AndroidAPTest";

    private static String PASSWD = "androidwifi";

    private final static String OUTPUT_FILE = "WifiStressTestOutput.txt";

    private int mTotalIterations;

    private BufferedWriter mOutputWriter = null;

    private int mLastIteration = 0;

    private boolean mWifiOnlyFlag;



    public WifiApStress() {

        super(WifiApStress.class.getSimpleName());

    }



    @Override

    protected void setUp() throws Exception {

        super.setUp();

        ConnectivityManagerStressTestRunner mRunner =

            (ConnectivityManagerStressTestRunner)getInstrumentation();

        mTotalIterations = mRunner.getSoftApInterations();

        mWifiOnlyFlag = mRunner.isWifiOnly();

        turnScreenOn();

    }



    @Override

    protected void tearDown() throws Exception {

        // write the total number of iterations into output file

        mOutputWriter = new BufferedWriter(new FileWriter(new File(

                Environment.getExternalStorageDirectory(), OUTPUT_FILE)));

        mOutputWriter.write(String.format("iteration %d out of %d\n",

                mLastIteration + 1, mTotalIterations));

        mOutputWriter.flush();

        mOutputWriter.close();

        super.tearDown();

    }



    @LargeTest

    public void testWifiHotSpot() {

        if (mWifiOnlyFlag) {

            logv(getName() + " is excluded for wi-fi only test");

            return;

        }

        WifiConfiguration config = new WifiConfiguration();

        config.SSID = NETWORK_ID;

        config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);

        config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);

        config.preSharedKey = PASSWD;



        // if wifiap enabled, disable it

        assertTrue("failed to disable wifi hotspot",

                mWifiManager.setWifiApEnabled(config, false));

        assertTrue("wifi hotspot not enabled", waitForWifiApState(

                WifiManager.WIFI_AP_STATE_DISABLED, 2 * LONG_TIMEOUT));



        // if Wifi is enabled, disable it

        if (mWifiManager.isWifiEnabled()) {

            assertTrue("failed to disable wifi", disableWifi());

            // wait for the wifi state to be DISABLED

            assertTrue("wifi state not disabled", waitForWifiState(

                    WifiManager.WIFI_STATE_DISABLED, LONG_TIMEOUT));

        }

        int i;

        for (i = 0; i < mTotalIterations; i++) {

            logv("iteration: " + i);

            mLastIteration = i;

            // enable Wifi tethering

            assertTrue("failed to enable wifi hotspot",

                    mWifiManager.setWifiApEnabled(config, true));

            // wait for wifi ap state to be ENABLED

            assertTrue("wifi hotspot not enabled", waitForWifiApState(

                    WifiManager.WIFI_AP_STATE_ENABLED, 2 * LONG_TIMEOUT));

            // wait for wifi tethering result

            assertTrue("tether state not changed", waitForTetherStateChange(LONG_TIMEOUT));

            // allow the wifi tethering to be enabled for 10 seconds

            try {

                Thread.sleep(2 * SHORT_TIMEOUT);

            } catch (Exception e) {

                // ignore

            }

            assertTrue("no uplink data connection after Wi-Fi tethering", pingTest());

            // disable wifi hotspot

            assertTrue("failed to disable wifi hotspot",

                    mWifiManager.setWifiApEnabled(config, false));

            assertTrue("wifi hotspot not enabled", waitForWifiApState(

                    WifiManager.WIFI_AP_STATE_DISABLED, 2 * LONG_TIMEOUT));

            assertFalse("wifi hotspot still enabled", mWifiManager.isWifiApEnabled());

        }

    }



}