Check VPN status when adding/removing restricted profiles
Restricted profiles are tied to a VPN of the parent user. addVpnUserLocked/
removeVpnUserLocked should not be called for restricted profiles when VPN
is not active, because they will throw an exception.
Bug: 27296721
Change-Id: Ifcfaa85c12fbca1bbad81217c2f0d07a79347547
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index f231f92..3b0b79a 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -718,7 +718,8 @@
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 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);