commit 44a9f1275a99984d8287332c282feea15c2b307c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 02 18:16:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 02 18:16:56 2016 +0000
tree 42a459d8fe6f2c3d9188de703b16afd135ba5c88
parent 4efb05a92b0907eb0cea4f47c52c7463cd548ed2
parent 8be8e626d235b5a0bc042d1c011b52f96b69978f

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

src/com/android/settings/network/VpnPreferenceController.java

diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 3c4877f..146b400 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -59,8 +59,7 @@
 
     @Override
     public boolean isAvailable() {
-        // TODO: http://b/23693383
-        return mIsSecondaryUser || RestrictedLockUtils.hasBaseUserRestriction(mContext,
+        return !RestrictedLockUtils.hasBaseUserRestriction(mContext,
                 UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId());
     }