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 "Tethering: replace argsContain with CollectionUtils.contains" am: 7cdc4a0769

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2067236

Change-Id: I83d900afd75497a7705ad2e2bd3228f6e9b605e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-04-20 11:09:08 +00:00 • committed by Automerger Merge Worker
commit 352247d5a6
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Tethering/src/com/android/networkstack/tethering/Tethering.java
View file

@ -135,6 +135,7 @@ import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
import com.android.modules.utils.build.SdkLevel;
import com.android.net.module.util.BaseNetdUnsolicitedEventListener;
import com.android.net.module.util.CollectionUtils;
import com.android.networkstack.apishim.common.BluetoothPanShim;
import com.android.networkstack.apishim.common.BluetoothPanShim.TetheredInterfaceCallbackShim;
import com.android.networkstack.apishim.common.BluetoothPanShim.TetheredInterfaceRequestShim;
@ -2513,12 +2514,12 @@ public class Tethering {
writer, " ");
// Used for testing instead of human debug.
if (argsContain(args, "bpfRawMap")) {
if (CollectionUtils.contains(args, "bpfRawMap")) {
mBpfCoordinator.dumpRawMap(pw, args);
return;
}
if (argsContain(args, "bpf")) {
if (CollectionUtils.contains(args, "bpf")) {
dumpBpf(pw);
return;
}
@ -2584,7 +2585,7 @@ public class Tethering {
pw.println("Log:");
pw.increaseIndent();
if (argsContain(args, "--short")) {
if (CollectionUtils.contains(args, "--short")) {
pw.println("<log removed for brevity>");
} else {
mLog.dump(fd, pw, args);
@ -2628,13 +2629,6 @@ public class Tethering {
if (e != null) throw e;
}
private static boolean argsContain(String[] args, String target) {
for (String arg : args) {
if (target.equals(arg)) return true;
}
return false;
}
private void updateConnectedClients(final List<WifiClient> wifiClients) {
if (mConnectedClientsTracker.updateConnectedClients(mTetherMainSM.getAllDownstreams(),
wifiClients)) {