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

Commit 3d3eac7b authored by Xia Wang's avatar Xia Wang Committed by Android Git Automerger
Browse files

am 68c37742: am b4510e3c: Merge "Fix Wifi Stress test after wifi settings are... 

am 68c37742: am b4510e3c: Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev

* commit '68c37742':
  Fix Wifi Stress test after wifi settings are moved to Settings.global
parents 47a39892 68c37742

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

+8 −7
Original line number Diff line number Diff line
@@ -219,15 +219,16 @@ public class WifiStressTest 
    // Stress Wifi reconnection to secure net after sleep

    @LargeTest

    public void testWifiReconnectionAfterSleep() {

        int value = Settings.System.getInt(mRunner.getContext().getContentResolver(),

                Settings.System.WIFI_SLEEP_POLICY, -1);

        if (value < 0) {

            Settings.System.putInt(mRunner.getContext().getContentResolver(),

                    Settings.System.WIFI_SLEEP_POLICY, Settings.System.WIFI_SLEEP_POLICY_DEFAULT);

        int value = Settings.Global.getInt(mRunner.getContext().getContentResolver(),

                Settings.Global.WIFI_SLEEP_POLICY, -1);

        log("wifi sleep policy is: " + value);

        if (value != Settings.Global.WIFI_SLEEP_POLICY_DEFAULT) {

            Settings.Global.putInt(mRunner.getContext().getContentResolver(),

                    Settings.Global.WIFI_SLEEP_POLICY, Settings.Global.WIFI_SLEEP_POLICY_DEFAULT);

            log("set wifi sleep policy to default value");

        }

        Settings.Secure.putLong(mRunner.getContext().getContentResolver(),

                Settings.Secure.WIFI_IDLE_MS, WIFI_IDLE_MS);

        Settings.Global.putLong(mRunner.getContext().getContentResolver(),

                Settings.Global.WIFI_IDLE_MS, WIFI_IDLE_MS);



        // Connect to a Wi-Fi network

        WifiConfiguration config = new WifiConfiguration();