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

Fix ServiceConnectionLeak in network fragment

Browse Source 
Change-Id: I43efe9ae31fc2f58361abdb034b0205a3f3e2b71
Fix: 35957226
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-03-03 17:59:23 -08:00
parent 50aa0008fc
commit f5f71a9be2
4 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
View File

@@ -18,9 +18,10 @@ package com.android.settings.network;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.net.ConnectivityManager;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import com.android.settings.R;
@@ -35,6 +36,9 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.concurrent.atomic.AtomicReference;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -64,6 +68,18 @@ public class TetherPreferenceControllerTest {
ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
}
@Test
public void goThroughLifecycle_shouldDestoryBluetoothProfile() {
final BluetoothPan pan = mock(BluetoothPan.class);
final AtomicReference<BluetoothPan> panRef =
ReflectionHelpers.getField(mController, "mBluetoothPan");
panRef.set(pan);
mController.onDestroy();
verify(mBluetoothAdapter).closeProfileProxy(BluetoothProfile.PAN, pan);
}
@Test
public void updateSummary_noPreference_noInteractionWithConnectivityManager() {
mController.updateSummary();