PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-13 04:18:18 +00:00
committed by Android (Google) Code Review
parent e060311358 a52782bc06
commit 02b7b16c93
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
View File

@@ -124,6 +124,9 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
List<Integer> mResultCodeArrayList; List<Integer> mResultCodeArrayList;
@VisibleForTesting @VisibleForTesting
WifiPickerTracker mWifiPickerTracker; WifiPickerTracker mWifiPickerTracker;
// Worker thread used for WifiPickerTracker work
@VisibleForTesting
HandlerThread mWorkerThread;
private boolean mIsSingleNetwork; private boolean mIsSingleNetwork;
private boolean mAnyNetworkSavedSuccess; private boolean mAnyNetworkSavedSuccess;
@@ -133,8 +136,6 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
private UiConfigurationItemAdapter mUiConfigurationItemAdapter; private UiConfigurationItemAdapter mUiConfigurationItemAdapter;
private WifiManager.ActionListener mSaveListener; private WifiManager.ActionListener mSaveListener;
private WifiManager mWifiManager; private WifiManager mWifiManager;
// Worker thread used for WifiPickerTracker work
private HandlerThread mWorkerThread;
private final Handler mHandler = new Handler() { private final Handler mHandler = new Handler() {
@Override @Override
@@ -202,6 +203,13 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
return inflater.inflate(R.layout.wifi_add_app_networks, container, false); return inflater.inflate(R.layout.wifi_add_app_networks, container, false);
} }
@Override
public void onDestroy() {
mWorkerThread.quit();
super.onDestroy();
}
@Override @Override
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);

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

@@ -19,7 +19,9 @@ package com.android.settings.wifi.addappnetworks;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
@@ -27,6 +29,7 @@ import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WifiNetworkSuggestion; import android.net.wifi.WifiNetworkSuggestion;
import android.os.Bundle; import android.os.Bundle;
import android.os.HandlerThread;
import android.os.Parcelable; import android.os.Parcelable;
import android.provider.Settings; import android.provider.Settings;
import android.widget.TextView; import android.widget.TextView;
@@ -247,6 +250,19 @@ public class AddAppNetworksFragmentTest {
SCANED_LEVEL0); 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() { private void setUpOneScannedNetworkWithScanedLevel4() {
final ArrayList list = new ArrayList<>(); final ArrayList list = new ArrayList<>();
list.add(mMockWifiEntry); list.add(mMockWifiEntry);