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

23
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -28,6 +28,9 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnDestroy;
import java.util.concurrent.atomic.AtomicReference;
@@ -35,7 +38,8 @@ import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
public class TetherPreferenceController extends PreferenceController {
public class TetherPreferenceController extends PreferenceController
implements LifecycleObserver, OnDestroy {
private static final String KEY_TETHER_SETTINGS = "tether_settings";
@@ -62,12 +66,12 @@ public class TetherPreferenceController extends PreferenceController {
TetherPreferenceController() {
super(null);
mAdminDisallowedTetherConfig = false;
mBluetoothPan = null;
mBluetoothPan = new AtomicReference<>();
mConnectivityManager = null;
mBluetoothAdapter = null;
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}
public TetherPreferenceController(Context context) {
public TetherPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
mBluetoothPan = new AtomicReference<>();
mAdminDisallowedTetherConfig = checkIfRestrictionEnforced(
@@ -75,6 +79,9 @@ public class TetherPreferenceController extends PreferenceController {
mConnectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
if (lifecycle != null) {
lifecycle.addObserver(this);
}
if (mBluetoothAdapter != null) {
mBluetoothAdapter.getProfileProxy(context, mBtProfileServiceListener,
BluetoothProfile.PAN);
@@ -113,6 +120,14 @@ public class TetherPreferenceController extends PreferenceController {
return KEY_TETHER_SETTINGS;
}
@Override
public void onDestroy() {
final BluetoothProfile profile = mBluetoothPan.getAndSet(null);
if (profile != null && mBluetoothAdapter != null) {
mBluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN, profile);
}
}
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
void updateSummary() {
if (mPreference == null) {