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

Commit 9fc28c5a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c 

Change-Id: I8a1d93bb01c0aa739798a0be709f660c1f6e5da1
parents 12240e4d 02b7b16c

src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java

+10 −2
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements 
    List<Integer> mResultCodeArrayList;

    @VisibleForTesting

    WifiPickerTracker mWifiPickerTracker;

    // Worker thread used for WifiPickerTracker work

    @VisibleForTesting

    HandlerThread mWorkerThread;



    private boolean mIsSingleNetwork;

    private boolean mAnyNetworkSavedSuccess;
@@ -133,8 +136,6 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements 
    private UiConfigurationItemAdapter mUiConfigurationItemAdapter;

    private WifiManager.ActionListener mSaveListener;

    private WifiManager mWifiManager;

    // Worker thread used for WifiPickerTracker work

    private HandlerThread mWorkerThread;



    private final Handler mHandler = new Handler() {

        @Override
@@ -202,6 +203,13 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements 
        return inflater.inflate(R.layout.wifi_add_app_networks, container, false);

    }



    @Override

    public void onDestroy() {

        mWorkerThread.quit();



        super.onDestroy();

    }



    @Override

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);

tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java

+16 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ package com.android.settings.wifi.addappnetworks; 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.settings.SettingsEnums;
@@ -27,6 +29,7 @@ import android.net.wifi.WifiConfiguration; 
import android.net.wifi.WifiManager;

import android.net.wifi.WifiNetworkSuggestion;

import android.os.Bundle;

import android.os.HandlerThread;

import android.os.Parcelable;

import android.provider.Settings;

import android.widget.TextView;
@@ -247,6 +250,19 @@ public class AddAppNetworksFragmentTest { 
                SCANED_LEVEL0);

    }



    @Test

    public void onDestroy_quitWorkerThread() {

        mAddAppNetworksFragment.mWorkerThread = mock(HandlerThread.class);



        try {

            mAddAppNetworksFragment.onDestroy();

        } catch (IllegalArgumentException e) {

            // Ignore the exception from super class.

        }



        verify(mAddAppNetworksFragment.mWorkerThread).quit();

    }



    private void setUpOneScannedNetworkWithScanedLevel4() {

        final ArrayList list = new ArrayList<>();

        list.add(mMockWifiEntry);