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

Commit 212083bd authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c8 

am: 8d279364

* commit '8d279364':
  Move VPN restriction check into setup dialog

Change-Id: I4beb9edb0ec4631cef969250e36083a518e2d9b7
parents e6e9a701 8d279364

packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.Bundle; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.text.Html;

import android.text.Html.ImageGetter;

import android.util.Log;
@@ -55,6 +56,10 @@ public class ConfirmDialog extends AlertActivity 
            finish();

            return;

        }

        if (UserManager.get(this).hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {

            finish();

            return;

        }

        View view = View.inflate(this, R.layout.confirm, null);

        ((TextView) view.findViewById(R.id.warning)).setText(

                Html.fromHtml(getString(R.string.warning, getVpnLabel()),

services/core/java/com/android/server/connectivity/Vpn.java

+1 −2
Original line number Diff line number Diff line
@@ -555,8 +555,7 @@ public class Vpn { 
        try {

            // Restricted users are not allowed to create VPNs, they are tied to Owner

            UserInfo user = mgr.getUserInfo(mUserHandle);

            if (user.isRestricted() || mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN,

                    new UserHandle(mUserHandle))) {

            if (user.isRestricted()) {

                throw new SecurityException("Restricted users cannot establish VPNs");

            }