joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"

Browse source 
am: 3b74d613e0

Change-Id: I0207294af01a5cc9594f563398753370e3c7e011
This commit is contained in:
Remi NGUYEN VAN 2020-01-20 23:05:12 -08:00 • committed by android-build-merger
commit f45fcda616
1 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
services/core/java/com/android/server/ConnectivityService.java
View file

@ -88,7 +88,6 @@ import android.net.Network;
import android.net.NetworkAgent;
import android.net.NetworkCapabilities;
import android.net.NetworkConfig;
import android.net.NetworkFactory;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMisc;
@ -2835,26 +2834,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
return true;
}
// TODO: delete when direct use of registerNetworkFactory is no longer supported.
private boolean maybeHandleNetworkFactoryMessage(Message msg) {
switch (msg.what) {
default:
return false;
case NetworkFactory.EVENT_UNFULFILLABLE_REQUEST: {
handleReleaseNetworkRequest((NetworkRequest) msg.obj, msg.sendingUid,
/* callOnUnavailable */ true);
break;
}
}
return true;
}
@Override
public void handleMessage(Message msg) {
if (!maybeHandleAsyncChannelMessage(msg)
&& !maybeHandleNetworkMonitorMessage(msg)
&& !maybeHandleNetworkAgentInfoMessage(msg)
&& !maybeHandleNetworkFactoryMessage(msg)) {
&& !maybeHandleNetworkAgentInfoMessage(msg)) {
maybeHandleNetworkAgentMessage(msg);
}
}