commit f04bcebd4e9fdc3323c492059d107043e4d8109a
author Robin Lee <rgl@google.com> Thu Jun 25 22:27:54 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 22:27:55 2015 +0000
tree 0975d4cbf2187841742131989329dcc38e2fb2be
parent 30d6b2b8f119cd503577303e3a80313418753333
parent dd142295da8912c1f2d972341abb2e5b761075e9

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

src/com/android/settings/vpn2/VpnSettings.java

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