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

Commit 5af6e7d4 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c8 am: 8d279364" into nyc-mr1-dev-plus-aosp
parents 3b5aac25 212083bd

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

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

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.text.Html;

import android.text.Html;

import android.text.Html.ImageGetter;

import android.text.Html.ImageGetter;

import android.util.Log;

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

            finish();

            return;

            return;

        }

        }

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

            finish();

            return;

        }

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

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

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

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

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

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

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

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

        try {

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

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

            UserInfo user = mgr.getUserInfo(mUserHandle);

            UserInfo user = mgr.getUserInfo(mUserHandle);

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

            if (user.isRestricted()) {

                    new UserHandle(mUserHandle))) {

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

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

            }

            }