Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 630e9b5e authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android Git Automerger
Browse files

am a4aab96e: am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev 

* commit 'a4aab96e':
  Say in the doc that DISALLOW_CONFIG_VPN now works.
parents 0bf33966 a4aab96e

core/java/android/os/UserManager.java

+2 −1
Original line number Diff line number Diff line
@@ -177,7 +177,8 @@ public class UserManager { 
    /**

     * Specifies if a user is disallowed from configuring VPN.

     * The default value is <code>false</code>.

     * This restriction has no effect in a managed profile.

     * This restriction has an effect in a managed profile only from

     * {@link android.os.Build.VERSION_CODES#MNC}

     *

     * <p/>Key for user restrictions.

     * <p/>Type: Boolean