Remove handling of EVENT_UNFULFILLABLE_REQUEST
This message is not being sent by any component anymore. Test: built, flashed, WiFi and telephony working Test: atest FrameworksNetTests Bug: 138306002 Change-Id: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
This commit is contained in:
@@ -87,7 +87,6 @@ import android.net.NetworkAgent;
|
|||||||
import android.net.NetworkAgentConfig;
|
import android.net.NetworkAgentConfig;
|
||||||
import android.net.NetworkCapabilities;
|
import android.net.NetworkCapabilities;
|
||||||
import android.net.NetworkConfig;
|
import android.net.NetworkConfig;
|
||||||
import android.net.NetworkFactory;
|
|
||||||
import android.net.NetworkInfo;
|
import android.net.NetworkInfo;
|
||||||
import android.net.NetworkInfo.DetailedState;
|
import android.net.NetworkInfo.DetailedState;
|
||||||
import android.net.NetworkMonitorManager;
|
import android.net.NetworkMonitorManager;
|
||||||
@@ -2843,26 +2842,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
return true;
|
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
|
@Override
|
||||||
public void handleMessage(Message msg) {
|
public void handleMessage(Message msg) {
|
||||||
if (!maybeHandleAsyncChannelMessage(msg)
|
if (!maybeHandleAsyncChannelMessage(msg)
|
||||||
&& !maybeHandleNetworkMonitorMessage(msg)
|
&& !maybeHandleNetworkMonitorMessage(msg)
|
||||||
&& !maybeHandleNetworkAgentInfoMessage(msg)
|
&& !maybeHandleNetworkAgentInfoMessage(msg)) {
|
||||||
&& !maybeHandleNetworkFactoryMessage(msg)) {
|
|
||||||
maybeHandleNetworkAgentMessage(msg);
|
maybeHandleNetworkAgentMessage(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user