Merge "Make Vpn.isAvailable return available, not unavailable"

2016-11-02 18:16:55 +00:00
parent 4efb05a92b 8be8e626d2
commit 44a9f1275a
1 changed files with 1 additions and 2 deletions
--- 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());
    }