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

Merge "Remove @hide CollectionUtils in QosCallbackTracker"

Browse Source
This commit is contained in:
Treehugger Robot
2021-03-04 04:22:18 +00:00
committed by Gerrit Code Review
parent a3ece1e428 570207cc75
commit 33e7f16a5d
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/connectivity/QosCallbackTracker.java
View File

@@ -29,7 +29,7 @@ import android.os.IBinder;
import android.telephony.data.EpsBearerQosSessionAttributes;
import android.util.Log;
import com.android.internal.util.CollectionUtils;
import com.android.net.module.util.CollectionUtils;
import com.android.server.ConnectivityService;
import java.util.ArrayList;
@@ -156,12 +156,13 @@ public class QosCallbackTracker {
private void handleUnregisterCallback(@NonNull final IBinder binder,
final boolean sendToNetworkAgent) {
final QosCallbackAgentConnection agentConnection =
CollectionUtils.find(mConnections, c -> c.getBinder().equals(binder));
if (agentConnection == null) {
logw("handleUnregisterCallback: agentConnection is null");
final int connIndex =
CollectionUtils.indexOf(mConnections, c -> c.getBinder().equals(binder));
if (connIndex < 0) {
logw("handleUnregisterCallback: no matching agentConnection");
return;
}
final QosCallbackAgentConnection agentConnection = mConnections.get(connIndex);
if (DBG) {
log("handleUnregisterCallback: unregister "
@@ -226,10 +227,10 @@ public class QosCallbackTracker {
* @param network the network that was released
*/
public void handleNetworkReleased(@Nullable final Network network) {
final List<QosCallbackAgentConnection> connections =
CollectionUtils.filter(mConnections, ac -> ac.getNetwork().equals(network));
for (final QosCallbackAgentConnection agentConnection : connections) {
// Iterate in reverse order as agent connections will be removed when unregistering
for (int i = mConnections.size() - 1; i >= 0; i--) {
final QosCallbackAgentConnection agentConnection = mConnections.get(i);
if (!agentConnection.getNetwork().equals(network)) continue;
agentConnection.sendEventQosCallbackError(
QosCallbackException.EX_TYPE_FILTER_NETWORK_RELEASED);
@@ -247,15 +248,14 @@ public class QosCallbackTracker {
@NonNull final String logPrefix,
@NonNull final AgentConnectionAction action) {
mConnectivityServiceHandler.post(() -> {
final QosCallbackAgentConnection ac =
CollectionUtils.find(mConnections,
final int acIndex = CollectionUtils.indexOf(mConnections,
c -> c.getAgentCallbackId() == qosCallbackId);
if (ac == null) {
if (acIndex == -1) {
loge(logPrefix + ": " + qosCallbackId + " missing callback id");
return;
}
action.execute(ac);
action.execute(mConnections.get(acIndex));
});
}