Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"

Browse Source 
am: c5d825c14e

Change-Id: I0207294af01a5cc9594f563398753370e3c7e011
This commit is contained in:
Remi NGUYEN VAN
2020-01-20 23:05:12 -08:00
committed by android-build-merger
parent 02cfa7aaf3 c5d825c14e
commit 1b921169b7
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/NetworkFactory.java
View File

@@ -115,13 +115,6 @@ public class NetworkFactory extends Handler {
*/ */
private static final int CMD_SET_FILTER = BASE + 3; private static final int CMD_SET_FILTER = BASE + 3;
/**
* Sent by NetworkFactory to ConnectivityService to indicate that a request is
* unfulfillable.
* @see #releaseRequestAsUnfulfillableByAnyFactory(NetworkRequest).
*/
public static final int EVENT_UNFULFILLABLE_REQUEST = BASE + 4;
private final Context mContext; private final Context mContext;
private final ArrayList<Message> mPreConnectedQueue = new ArrayList<Message>(); private final ArrayList<Message> mPreConnectedQueue = new ArrayList<Message>();
private final String LOG_TAG; private final String LOG_TAG;

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.NetworkAgent;
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.NetworkMisc; import android.net.NetworkMisc;
@@ -2835,26 +2834,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);
} }
} }