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

Remove framework-connectivity-shared-srcs from net-utils-all-srcs

Browse source 
Having framework-connectivity-shared-srcs in net-utils-all-srcs is risky because it's also adds classes to other modules like WiFi.

Bug: 376587883
Change-Id: I829cc6f1e9865e6a5fc23ddcfa8d6f45aac27e06
This commit is contained in:
Handa Wang 2024-11-01 09:25:28 +00:00
commit e12dfea4f0
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
staticlibs/Android.bp
View file

@ -671,11 +671,12 @@ filegroup {
visibility: ["//visibility:private"],
}
// Sources outside of com.android.net.module.util should not be added because many modules depend on
// them and need jarjar rules
filegroup {
name: "net-utils-all-srcs",
srcs: [
"device/**/*.java",
":framework-connectivity-shared-srcs",
":net-utils-framework-common-srcs",
],
visibility: ["//visibility:private"],

15
staticlibs/device/com/android/net/module/util/PrivateAddressCoordinator.java
View file

@ -35,12 +35,12 @@ import android.net.Network;
import android.net.NetworkCapabilities;
import android.os.RemoteException;
import android.util.ArrayMap;
import android.util.IndentingPrintWriter;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
import java.io.PrintWriter;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.util.ArrayList;
@ -459,34 +459,27 @@ public class PrivateAddressCoordinator {
}
}
// TODO: dump PrivateAddressCoordinator when dumping RoutingCoordinatorService.
void dump(final IndentingPrintWriter pw) {
// TODO: dump PrivateAddressCoordinator when dumping RoutingCoordinatorService and apply
// indentation.
void dump(final PrintWriter pw) {
pw.println("mTetheringPrefixes:");
pw.increaseIndent();
for (IpPrefix prefix : mTetheringPrefixes) {
pw.println(prefix);
}
pw.decreaseIndent();
pw.println("mUpstreamPrefixMap:");
pw.increaseIndent();
for (int i = 0; i < mUpstreamPrefixMap.size(); i++) {
pw.println(mUpstreamPrefixMap.keyAt(i) + " - " + mUpstreamPrefixMap.valueAt(i));
}
pw.decreaseIndent();
pw.println("mDownstreams:");
pw.increaseIndent();
for (LinkAddress downstream : mDownstreams.values()) {
pw.println(downstream);
}
pw.decreaseIndent();
pw.println("mCachedAddresses:");
pw.increaseIndent();
for (int i = 0; i < mCachedAddresses.size(); i++) {
pw.println(mCachedAddresses.keyAt(i) + " - " + mCachedAddresses.valueAt(i));
}
pw.decreaseIndent();
}
}