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

resolve merge conflicts of 90f009ebb5 to master

Browse Source 
Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46
This commit is contained in:
Robin Lee
2017-03-27 17:35:34 +01:00
parent f7fb763ed5 90f009ebb5
commit b26ce1e13b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,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.Activity;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -215,9 +216,16 @@ public class VpnSettings extends RestrictedSettingsFragment implements
@Override @WorkerThread @Override @WorkerThread
public boolean handleMessage(Message message) { public boolean handleMessage(Message 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();
@@ -226,7 +234,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 UpdatePreferences(this) activity.runOnUiThread(new UpdatePreferences(this)
.legacyVpns(vpnProfiles, connectedLegacyVpns, lockdownVpnKey) .legacyVpns(vpnProfiles, connectedLegacyVpns, lockdownVpnKey)
.appVpns(vpnApps, connectedAppVpns, alwaysOnAppVpnInfos)); .appVpns(vpnApps, connectedAppVpns, alwaysOnAppVpnInfos));