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

Merge "Reinstate USER_PRESENT for ConnectivityService" am: ba7503a1eb am: 02f7e1039b

Browse Source 
am: 4d00a13c35

Change-Id: Id22859b30b848418cbc1bcf46c74ebd2aa88cd06
This commit is contained in:
Robin Lee
2017-02-21 18:13:12 +00:00
committed by android-build-merger
parent 4b03d2d6d5 02f7e1039b
commit 0b86c5519c
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -815,6 +815,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
intentFilter.addAction(Intent.ACTION_USER_UNLOCKED); intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);
mContext.registerReceiverAsUser( mContext.registerReceiverAsUser(
mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null); mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null);
mContext.registerReceiverAsUser(mUserPresentReceiver, UserHandle.SYSTEM,
new IntentFilter(Intent.ACTION_USER_PRESENT), null, null);
try { try {
mNetd.registerObserver(mTethering); mNetd.registerObserver(mTethering);
@@ -4008,6 +4010,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
}; };
private BroadcastReceiver mUserPresentReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
// Try creating lockdown tracker, since user present usually means
// unlocked keystore.
updateLockdownVpn();
mContext.unregisterReceiver(this);
}
};
private final HashMap<Messenger, NetworkFactoryInfo> mNetworkFactoryInfos = private final HashMap<Messenger, NetworkFactoryInfo> mNetworkFactoryInfos =
new HashMap<Messenger, NetworkFactoryInfo>(); new HashMap<Messenger, NetworkFactoryInfo>();
private final HashMap<NetworkRequest, NetworkRequestInfo> mNetworkRequests = private final HashMap<NetworkRequest, NetworkRequestInfo> mNetworkRequests =