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

Merge "Enable VPN settings for secondary users" into mnc-dev

Browse Source
This commit is contained in:
Robin Lee
2015-06-25 22:27:54 +00:00
committed by Android (Google) Code Review
parent 30d6b2b8f1 dd142295da
commit f04bcebd4e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,10 +106,10 @@ public class VpnSettings extends SettingsPreferenceFragment implements
super.onCreate(savedState); super.onCreate(savedState);
mUserManager = (UserManager) getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN) if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
|| UserHandle.myUserId() != UserHandle.USER_OWNER) {
mUnavailable = true; mUnavailable = true;
setPreferenceScreen(new PreferenceScreen(getActivity(), null)); setPreferenceScreen(new PreferenceScreen(getActivity(), null));
setHasOptionsMenu(false);
return; return;
} }
@@ -161,6 +161,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
super.onResume(); super.onResume();
if (mUnavailable) { if (mUnavailable) {
// Show a message to explain that VPN settings have been disabled
TextView emptyView = (TextView) getView().findViewById(android.R.id.empty); TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
getListView().setEmptyView(emptyView); getListView().setEmptyView(emptyView);
if (emptyView != null) { if (emptyView != null) {
@@ -187,6 +188,11 @@ public class VpnSettings extends SettingsPreferenceFragment implements
@Override @Override
public void onPause() { public void onPause() {
if (mUnavailable()) {
super.onPause();
return;
}
// Stop monitoring // Stop monitoring
mConnectivityManager.unregisterNetworkCallback(mNetworkCallback); mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);