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

Merge changes from topic 'wifi-alternate-reality'

Browse Source 
* changes:
  Pin a process to wifi when it calls enableNetwork(..., true)
  Make CALLBACK_PRECHECK actually work.
This commit is contained in:
Lorenzo Colitti
2015-04-16 16:11:15 +00:00
committed by Android (Google) Code Review
parent 3f35740bd8 0f6d6bdb0e
commit 87a81fd19f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4255,9 +4255,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
networkAgent.created = true; networkAgent.created = true;
updateLinkProperties(networkAgent, null); updateLinkProperties(networkAgent, null);
notifyIfacesChanged(); notifyIfacesChanged();
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_PRECHECK);
networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED); networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
scheduleUnvalidatedPrompt(networkAgent); scheduleUnvalidatedPrompt(networkAgent);
if (networkAgent.isVPN()) { if (networkAgent.isVPN()) {
// Temporarily disable the default proxy (not global). // Temporarily disable the default proxy (not global).
synchronized (mProxyLock) { synchronized (mProxyLock) {
@@ -4270,9 +4271,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
// TODO: support proxy per network. // TODO: support proxy per network.
} }
// Consider network even though it is not yet validated. // Consider network even though it is not yet validated.
rematchNetworkAndRequests(networkAgent, NascentState.NOT_JUST_VALIDATED, rematchNetworkAndRequests(networkAgent, NascentState.NOT_JUST_VALIDATED,
ReapUnvalidatedNetworks.REAP); ReapUnvalidatedNetworks.REAP);
// This has to happen after matching the requests, because callbacks are just requests.
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_PRECHECK);
} else if (state == NetworkInfo.State.DISCONNECTED || } else if (state == NetworkInfo.State.DISCONNECTED ||
state == NetworkInfo.State.SUSPENDED) { state == NetworkInfo.State.SUSPENDED) {
networkAgent.asyncChannel.disconnect(); networkAgent.asyncChannel.disconnect();