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

Fix memory leak in TetherSettings

Browse Source 
- Make declare callback as static class to avoid memory leak.

Bug: 236914626
Test: manual test
Change-Id: Icdf511dc14d62e6422bbe4e30d4345f6944d81a8
This commit is contained in:
Hugh Chen
2022-07-01 08:17:39 +00:00
parent 21d6249393
commit 1e3d595b22
1 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/com/android/settings/TetherSettings.java
View File

@@ -324,13 +324,13 @@ public class TetherSettings extends RestrictedSettingsFragment
mStartTetheringCallback = new OnStartTetheringCallback(this); mStartTetheringCallback = new OnStartTetheringCallback(this);
mTetheringEventCallback = new TetheringEventCallback(); mTetheringEventCallback = new TetheringEventCallback(this);
mTm.registerTetheringEventCallback(r -> mHandler.post(r), mTetheringEventCallback); mTm.registerTetheringEventCallback(r -> mHandler.post(r), mTetheringEventCallback);
mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState()); mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
registerReceiver(); registerReceiver();
mEthernetListener = new EthernetListener(); mEthernetListener = new EthernetListener(this);
if (mEm != null) if (mEm != null)
mEm.addInterfaceStateListener(r -> mHandler.post(r), mEthernetListener); mEm.addInterfaceStateListener(r -> mHandler.post(r), mEthernetListener);
@@ -640,25 +640,56 @@ public class TetherSettings extends RestrictedSettingsFragment
} }
} }
private final class TetheringEventCallback implements TetheringManager.TetheringEventCallback { private static final class TetheringEventCallback implements
TetheringManager.TetheringEventCallback {
final WeakReference<TetherSettings> mTetherSettings;
TetheringEventCallback(TetherSettings settings) {
mTetherSettings = new WeakReference<>(settings);
}
@Override @Override
public void onTetheredInterfacesChanged(List<String> interfaces) { public void onTetheredInterfacesChanged(List<String> interfaces) {
Log.d(TAG, "onTetheredInterfacesChanged() interfaces : " + interfaces.toString()); final TetherSettings tetherSettings = mTetherSettings.get();
String[] tethered = interfaces.toArray(new String[interfaces.size()]); if (tetherSettings == null) {
updateUsbState(tethered); return;
updateBluetoothAndEthernetState(tethered); }
tetherSettings.onTetheredInterfacesChanged(interfaces);
} }
} }
private final class EthernetListener implements EthernetManager.InterfaceStateListener { void onTetheredInterfacesChanged(List<String> interfaces) {
Log.d(TAG, "onTetheredInterfacesChanged() interfaces : " + interfaces.toString());
final String[] tethered = interfaces.toArray(new String[interfaces.size()]);
updateUsbState(tethered);
updateBluetoothAndEthernetState(tethered);
}
private static final class EthernetListener implements EthernetManager.InterfaceStateListener {
final WeakReference<TetherSettings> mTetherSettings;
EthernetListener(TetherSettings settings) {
mTetherSettings = new WeakReference<>(settings);
}
@Override
public void onInterfaceStateChanged(@NonNull String iface, int state, int role, public void onInterfaceStateChanged(@NonNull String iface, int state, int role,
@NonNull IpConfiguration configuration) { @NonNull IpConfiguration configuration) {
if (state == EthernetManager.STATE_LINK_UP) { final TetherSettings tetherSettings = mTetherSettings.get();
mAvailableInterfaces.add(iface); if (tetherSettings == null) {
} else { return;
mAvailableInterfaces.remove(iface);
} }
updateBluetoothAndEthernetState(); tetherSettings.onInterfaceStateChanged(iface, state, role, configuration);
} }
} }
void onInterfaceStateChanged(@NonNull String iface, int state, int role,
@NonNull IpConfiguration configuration) {
if (state == EthernetManager.STATE_LINK_UP) {
mAvailableInterfaces.add(iface);
} else {
mAvailableInterfaces.remove(iface);
}
updateBluetoothAndEthernetState();
}
} }