LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca007

Browse Source 
am: 2bb6008a4c

* commit '2bb6008a4cd20654b268e13276c6a56ecc0eab2b':
  Stop user faster and clear stale broadcasts

Change-Id: I423d1f8448f8ba5b54f90a2fa192f231f38b761c
This commit is contained in:
Amith Yamasani
2016-04-29 00:58:58 +00:00
committed by android-build-merger
parent 33ec77265a 2bb6008a4c
commit 49392af782
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -730,7 +730,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
//set up the listener for user state for creating user VPNs //set up the listener for user state for creating user VPNs
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(Intent.ACTION_USER_STARTING); intentFilter.addAction(Intent.ACTION_USER_STARTING);
intentFilter.addAction(Intent.ACTION_USER_STOPPING); intentFilter.addAction(Intent.ACTION_USER_STOPPED);
intentFilter.addAction(Intent.ACTION_USER_ADDED); intentFilter.addAction(Intent.ACTION_USER_ADDED);
intentFilter.addAction(Intent.ACTION_USER_REMOVED); intentFilter.addAction(Intent.ACTION_USER_REMOVED);
intentFilter.addAction(Intent.ACTION_USER_UNLOCKED); intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);
@@ -3619,7 +3619,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
synchronized(mVpns) { synchronized(mVpns) {
Vpn userVpn = mVpns.get(userId); Vpn userVpn = mVpns.get(userId);
if (userVpn == null) { if (userVpn == null) {
loge("Stopping user has no VPN"); loge("Stopped user has no VPN");
return; return;
} }
mVpns.delete(userId); mVpns.delete(userId);
@@ -3664,7 +3664,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (Intent.ACTION_USER_STARTING.equals(action)) { if (Intent.ACTION_USER_STARTING.equals(action)) {
onUserStart(userId); onUserStart(userId);
} else if (Intent.ACTION_USER_STOPPING.equals(action)) { } else if (Intent.ACTION_USER_STOPPED.equals(action)) {
onUserStop(userId); onUserStop(userId);
} else if (Intent.ACTION_USER_ADDED.equals(action)) { } else if (Intent.ACTION_USER_ADDED.equals(action)) {
onUserAdded(userId); onUserAdded(userId);