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

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

Merge "Fix flaky WifiTracker tests."

parents 25fd1afa 5e0535ec

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+22 −15
Original line number Diff line number Diff line
@@ -149,6 +149,20 @@ public class WifiTracker { 
    @GuardedBy("mLock")

    private boolean mStaleScanResults = true;



    private static IntentFilter newIntentFilter() {

        IntentFilter filter = new IntentFilter();

        filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);

        filter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);

        filter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);

        filter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);

        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.RSSI_CHANGED_ACTION);



        return filter;

    }



    public WifiTracker(Context context, WifiListener wifiListener,

            boolean includeSaved, boolean includeScans) {

        this(context, wifiListener, null, includeSaved, includeScans);
@@ -169,15 +183,16 @@ public class WifiTracker { 
        this(context, wifiListener, workerLooper, includeSaved, includeScans, includePasspoints,

                context.getSystemService(WifiManager.class),

                context.getSystemService(ConnectivityManager.class),

                context.getSystemService(NetworkScoreManager.class), Looper.myLooper()

        );

                context.getSystemService(NetworkScoreManager.class),

                Looper.myLooper(), newIntentFilter());

    }



    @VisibleForTesting

    WifiTracker(Context context, WifiListener wifiListener, Looper workerLooper,

                boolean includeSaved, boolean includeScans, boolean includePasspoints,

                WifiManager wifiManager, ConnectivityManager connectivityManager,

            NetworkScoreManager networkScoreManager, Looper currentLooper) {

                NetworkScoreManager networkScoreManager, Looper currentLooper,

                IntentFilter filter) {

        if (!includeSaved && !includeScans) {

            throw new IllegalArgumentException("Must include either saved or scans");

        }
@@ -199,15 +214,7 @@ public class WifiTracker { 
        // check if verbose logging has been turned on or off

        sVerboseLogging = (mWifiManager.getVerboseLoggingLevel() > 0);



        mFilter = new IntentFilter();

        mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);

        mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);

        mFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);

        mFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);

        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);

        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);

        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);

        mFilter = filter;



        mNetworkRequest = new NetworkRequest.Builder()

                .clearCapabilities()

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

+13 −15
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import static org.mockito.Mockito.when; 


import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.net.ConnectivityManager;

import android.net.Network;

import android.net.NetworkInfo;
@@ -265,8 +266,7 @@ public class WifiTrackerTest { 
    }



    private WifiTracker createMockedWifiTracker() {

        WifiTracker tracker =

                new WifiTracker(

        return new WifiTracker(

                mContext,

                mockWifiListener,

                mWorkerLooper,
@@ -276,10 +276,8 @@ public class WifiTrackerTest { 
                mockWifiManager,

                mockConnectivityManager,

                mockNetworkScoreManager,

                        mMainLooper

                );



        return tracker;

                mMainLooper,

                new IntentFilter()); // empty filter to ignore system broadcasts

    }



    private void startTracking(WifiTracker tracker)  throws InterruptedException {