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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-02 18:16:55 +00:00
committed by Android (Google) Code Review
parent 4efb05a92b 8be8e626d2
commit 44a9f1275a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -59,8 +59,7 @@ public class VpnPreferenceController extends PreferenceController {
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
// TODO: http://b/23693383 return !RestrictedLockUtils.hasBaseUserRestriction(mContext,
return mIsSecondaryUser || RestrictedLockUtils.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId()); UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId());
} }