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

Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev am: 2f4286b792

Browse Source 
am: fc46e9e4ca

* commit 'fc46e9e4caf6c0dfe0b6f905a06c2d2b132d8173':
  ConnectivityService: listen to USER_UNLOCKED too
This commit is contained in:
Robin Lee
2016-03-02 02:00:05 +00:00
committed by android-build-merger
parent 640723b521 829f7c72e5
commit 0190497d11
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -750,7 +750,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
intentFilter.addAction(Intent.ACTION_USER_STOPPING); intentFilter.addAction(Intent.ACTION_USER_STOPPING);
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_PRESENT); intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);
mContext.registerReceiverAsUser( mContext.registerReceiverAsUser(
mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null); mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null);
@@ -3636,7 +3636,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private void onUserPresent(int userId) { private void onUserUnlocked(int userId) {
// User present may be sent because of an unlock, which might mean an unlocked keystore. // User present may be sent because of an unlock, which might mean an unlocked keystore.
if (mUserManager.getUserInfo(userId).isPrimary() && LockdownVpnTracker.isEnabled()) { if (mUserManager.getUserInfo(userId).isPrimary() && LockdownVpnTracker.isEnabled()) {
updateLockdownVpn(); updateLockdownVpn();
@@ -3660,8 +3660,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
onUserAdded(userId); onUserAdded(userId);
} else if (Intent.ACTION_USER_REMOVED.equals(action)) { } else if (Intent.ACTION_USER_REMOVED.equals(action)) {
onUserRemoved(userId); onUserRemoved(userId);
} else if (Intent.ACTION_USER_PRESENT.equals(action)) { } else if (Intent.ACTION_USER_UNLOCKED.equals(action)) {
onUserPresent(userId); onUserUnlocked(userId);
} }
} }
}; };