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

vpn: check fragment is visible before adding prefs

Browse Source 
As VPN settings listens to network events it may get woken up again
while it's in the background.

Bug: 23596799
Change-Id: If6e07493da447d7ded324ff86b6e7d57c5c615e3
This commit is contained in:
Robin Lee
2016-03-17 10:20:29 +00:00
parent 23f4261e3d
commit 37b179fa8c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -222,6 +222,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
public boolean handleMessage(Message message) { public boolean handleMessage(Message message) {
mUpdater.removeMessages(RESCAN_MESSAGE); mUpdater.removeMessages(RESCAN_MESSAGE);
// Run heavy RPCs before switching to UI thread
final List<VpnProfile> vpnProfiles = loadVpnProfiles(mKeyStore); final List<VpnProfile> vpnProfiles = loadVpnProfiles(mKeyStore);
final List<AppVpnInfo> vpnApps = getVpnApps(getActivity(), /* includeProfiles */ true); final List<AppVpnInfo> vpnApps = getVpnApps(getActivity(), /* includeProfiles */ true);
@@ -230,10 +231,15 @@ public class VpnSettings extends RestrictedSettingsFragment implements
final Set<Integer> readOnlyUsers = getReadOnlyUserProfiles(); final Set<Integer> readOnlyUsers = getReadOnlyUserProfiles();
// Refresh the PreferenceGroup which lists VPNs // Refresh list of VPNs
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
// Can't do anything useful if the context has gone away
if (!isAdded()) {
return;
}
// Find new VPNs by subtracting existing ones from the full set // Find new VPNs by subtracting existing ones from the full set
final Set<Preference> updates = new ArraySet<>(); final Set<Preference> updates = new ArraySet<>();