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

Merge "[VpnSettings]Crash when activity has been recycled"

Browse Source 
am: fb81f50c27

Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
This commit is contained in:
Robin Lee
2017-03-27 16:22:56 +00:00
committed by android-build-merger
parent a4def43fad fb81f50c27
commit c834ed1e4e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.settings.vpn2;
import android.annotation.UiThread; import android.annotation.UiThread;
import android.annotation.WorkerThread; import android.annotation.WorkerThread;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
@@ -208,9 +209,16 @@ public class VpnSettings extends RestrictedSettingsFragment implements
public boolean handleMessage(Message message) { public boolean handleMessage(Message message) {
mUpdater.removeMessages(RESCAN_MESSAGE); mUpdater.removeMessages(RESCAN_MESSAGE);
//Return if activity has been recycled
final Activity activity = getActivity();
if (activity == null) {
return true;
}
final Context context = activity.getApplicationContext();
// Run heavy RPCs before switching to UI thread // 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(context, /* includeProfiles */ true);
final Map<String, LegacyVpnInfo> connectedLegacyVpns = getConnectedLegacyVpns(); final Map<String, LegacyVpnInfo> connectedLegacyVpns = getConnectedLegacyVpns();
final Set<AppVpnInfo> connectedAppVpns = getConnectedAppVpns(); final Set<AppVpnInfo> connectedAppVpns = getConnectedAppVpns();
@@ -219,7 +227,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
final String lockdownVpnKey = VpnUtils.getLockdownVpn(); final String lockdownVpnKey = VpnUtils.getLockdownVpn();
// Refresh list of VPNs // Refresh list of VPNs
getActivity().runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
// Can't do anything useful if the context has gone away // Can't do anything useful if the context has gone away
@@ -271,7 +279,6 @@ public class VpnSettings extends RestrictedSettingsFragment implements
} }
} }
}); });
mUpdater.sendEmptyMessageDelayed(RESCAN_MESSAGE, RESCAN_INTERVAL_MS); mUpdater.sendEmptyMessageDelayed(RESCAN_MESSAGE, RESCAN_INTERVAL_MS);
return true; return true;
} }