Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check VPN status when adding/removing restricted profiles" into nyc-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2016-03-09 18:02:59 +00:00
committed by Android (Google) Code Review
parent ad2953c8a2 49d5a01e9b
commit fa4f3f2f2c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -718,7 +718,8 @@ public class Vpn {
public void onUserAdded(int userHandle) {
// If the user is restricted tie them to the parent user's VPN
UserInfo user = UserManager.get(mContext).getUserInfo(userHandle);
if (user.isRestricted() && user.restrictedProfileParentId == mUserHandle) {
if (user.isRestricted() && user.restrictedProfileParentId == mUserHandle
&& mVpnUsers != null) {
synchronized(Vpn.this) {
try {
addVpnUserLocked(userHandle);
@@ -736,7 +737,8 @@ public class Vpn {
public void onUserRemoved(int userHandle) {
// clean up if restricted
UserInfo user = UserManager.get(mContext).getUserInfo(userHandle);
if (user.isRestricted() && user.restrictedProfileParentId == mUserHandle) {
if (user.isRestricted() && user.restrictedProfileParentId == mUserHandle
&& mVpnUsers != null) {
synchronized(Vpn.this) {
try {
removeVpnUserLocked(userHandle);