From 8be8e626d235b5a0bc042d1c011b52f96b69978f Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Wed, 2 Nov 2016 12:49:11 +0000 Subject: [PATCH] Make Vpn.isAvailable return available, not unavailable Also removed the check about secondary users. We already disable adding a legacy VPN for secondary users inside the Settings page itself. We do not want to stop our users from configuring/disabling third party VPNs, that's completely supported. Bug: 23693383 Fix: 32308780 Test: manual, needs robotest Change-Id: I99ab14b6b26582bdd7fc491c4b2542f3e653f3dc --- src/com/android/settings/network/VpnPreferenceController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index 3c4877ff939..146b4000de4 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -59,8 +59,7 @@ public class VpnPreferenceController extends PreferenceController { @Override public boolean isAvailable() { - // TODO: http://b/23693383 - return mIsSecondaryUser || RestrictedLockUtils.hasBaseUserRestriction(mContext, + return !RestrictedLockUtils.hasBaseUserRestriction(mContext, UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId()); }