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

[Settings] Adjust code for performance

Browse Source 
Reorder code flow to reduce redundent work.

Bug: 213836977
Change-Id: Ie83e41dd2664f0d7828c1e13060e669496c41591
Test: Junit VpnPreferenceControllerTest
This commit is contained in:
Bonian Chen
2022-01-17 08:32:05 +00:00
parent 88bb28fc50
commit 033d46c71c
1 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -129,6 +129,35 @@ public class VpnPreferenceController extends AbstractPreferenceController
} }
UserManager userManager = mContext.getSystemService(UserManager.class); UserManager userManager = mContext.getSystemService(UserManager.class);
VpnManager vpnManager = mContext.getSystemService(VpnManager.class); VpnManager vpnManager = mContext.getSystemService(VpnManager.class);
String summary = getInsecureVpnSummaryOverride(userManager, vpnManager);
if (summary == null) {
final UserInfo userInfo = userManager.getUserInfo(UserHandle.myUserId());
final int uid;
if (userInfo.isRestricted()) {
uid = userInfo.restrictedProfileParentId;
} else {
uid = userInfo.id;
}
VpnConfig vpn = vpnManager.getVpnConfig(uid);
if ((vpn != null) && vpn.legacy) {
// Legacy VPNs should do nothing if the network is disconnected. Third-party
// VPN warnings need to continue as traffic can still go to the app.
final LegacyVpnInfo legacyVpn = vpnManager.getLegacyVpnInfo(uid);
if (legacyVpn == null || legacyVpn.state != LegacyVpnInfo.STATE_CONNECTED) {
vpn = null;
}
}
if (vpn == null) {
summary = mContext.getString(R.string.vpn_disconnected_summary);
} else {
summary = getNameForVpnConfig(vpn, UserHandle.of(uid));
}
}
final String finalSummary = summary;
ThreadUtils.postOnMainThread(() -> mPreference.setSummary(finalSummary));
}
protected int getNumberOfNonLegacyVpn(UserManager userManager, VpnManager vpnManager) {
// Copied from SystemUI::SecurityControllerImpl // Copied from SystemUI::SecurityControllerImpl
SparseArray<VpnConfig> vpns = new SparseArray<>(); SparseArray<VpnConfig> vpns = new SparseArray<>();
final List<UserInfo> users = userManager.getUsers(); final List<UserInfo> users = userManager.getUsers();
@@ -149,38 +178,22 @@ public class VpnPreferenceController extends AbstractPreferenceController
} }
vpns.put(user.id, cfg); vpns.put(user.id, cfg);
} }
int numberOfNonLegacyVpn = vpns.size() - connectedLegacyVpnCount; return vpns.size() - connectedLegacyVpnCount;
String summary = getInsecureVpnSummaryOverride(numberOfNonLegacyVpn);
if (summary == null) {
final UserInfo userInfo = userManager.getUserInfo(UserHandle.myUserId());
final int uid;
if (userInfo.isRestricted()) {
uid = userInfo.restrictedProfileParentId;
} else {
uid = userInfo.id;
}
VpnConfig vpn = vpns.get(uid);
if (vpn == null) {
summary = mContext.getString(R.string.vpn_disconnected_summary);
} else {
summary = getNameForVpnConfig(vpn, UserHandle.of(uid));
}
}
final String finalSummary = summary;
ThreadUtils.postOnMainThread(() -> mPreference.setSummary(finalSummary));
} }
protected String getInsecureVpnSummaryOverride(int numberOfNonLegacyVpn) { protected String getInsecureVpnSummaryOverride(UserManager userManager,
VpnManager vpnManager) {
// Optionally add warning icon if an insecure VPN is present. // Optionally add warning icon if an insecure VPN is present.
if (mPreference instanceof VpnInfoPreference) { if (mPreference instanceof VpnInfoPreference) {
final int insecureVpnCount = getInsecureVpnCount(); final int insecureVpnCount = getInsecureVpnCount();
boolean isInsecureVPN = insecureVpnCount > 0; boolean isInsecureVPN = insecureVpnCount > 0;
((VpnInfoPreference) mPreference).setInsecureVpn(isInsecureVPN); ((VpnInfoPreference) mPreference).setInsecureVpn(isInsecureVPN);
// Set the summary based on the total number of VPNs and insecure VPNs. // Set the summary based on the total number of VPNs and insecure VPNs.
if (isInsecureVPN) { if (isInsecureVPN) {
// Add the users and the number of legacy vpns to determine if there is more than // Add the users and the number of legacy vpns to determine if there is more than
// one vpn, since there can be more than one VPN per user. // one vpn, since there can be more than one VPN per user.
final int vpnCount = numberOfNonLegacyVpn final int vpnCount = getNumberOfNonLegacyVpn(userManager, vpnManager)
+ LegacyVpnProfileStore.list(Credentials.VPN).length; + LegacyVpnProfileStore.list(Credentials.VPN).length;
if (vpnCount == 1) { if (vpnCount == 1) {
return mContext.getString(R.string.vpn_settings_insecure_single); return mContext.getString(R.string.vpn_settings_insecure_single);