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

resolve merge conflicts of 6446d2f to master

Browse Source 
Change-Id: Ibf37d7fed8f8fbb32a601944f504494101c21a3e
This commit is contained in:
Robin Lee
2016-12-23 12:16:19 +00:00
parent 8a005f90ce 6446d2f0d8
commit d5afb5a60c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,6 +170,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
mUnavailable = mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN);
if (mUnavailable) { if (mUnavailable) {
// Show a message to explain that VPN settings have been disabled // Show a message to explain that VPN settings have been disabled
if (!isUiRestrictedByOnlyAdmin()) { if (!isUiRestrictedByOnlyAdmin()) {
@@ -178,6 +179,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
getPreferenceScreen().removeAll(); getPreferenceScreen().removeAll();
return; return;
} else { } else {
setEmptyView(getEmptyTextView());
getEmptyTextView().setText(R.string.vpn_no_vpns_added); getEmptyTextView().setText(R.string.vpn_no_vpns_added);
} }