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 "ConnectivityService - do not dumpBpfProgramStatus before T" into main am: cfdf420ae2

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

Change-Id: I1fb83338e6183c50b7e7e81f9ff043baab85051f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-06-16 13:38:48 +00:00 • committed by Automerger Merge Worker
commit 75de7ab243
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
service/src/com/android/server/ConnectivityService.java
View file

@ -134,6 +134,7 @@ import android.Manifest;
import android.annotation.CheckResult;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresApi;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.ActivityManager;
@ -283,8 +284,6 @@ import android.util.SparseArray;
import android.util.SparseIntArray;
import android.util.StatsEvent;
import androidx.annotation.RequiresApi;
import com.android.connectivity.resources.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
@ -3596,6 +3595,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.decreaseIndent();
}
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
private void dumpBpfProgramStatus(IndentingPrintWriter pw) {
pw.println("Bpf Program Status:");
pw.increaseIndent();
@ -4259,8 +4259,19 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.println();
dumpDestroySockets(pw);
pw.println();
dumpBpfProgramStatus(pw);
if (mDeps.isAtLeastT()) {
// R: https://android.googlesource.com/platform/system/core/+/refs/heads/android11-release/rootdir/init.rc
// shows /dev/cg2_bpf
// S: https://android.googlesource.com/platform/system/core/+/refs/heads/android12-release/rootdir/init.rc
// does not
// Thus cgroups are mounted at /dev/cg2_bpf on R and not on /sys/fs/cgroup
// so the following won't work (on R) anyway.
// The /sys/fs/cgroup path is only actually enforced/required starting with U,
// but it is very likely to already be the case (though not guaranteed) on T.
// I'm not at all sure about S - let's just skip it to get rid of lint warnings.
pw.println();
dumpBpfProgramStatus(pw);
}
if (null != mCarrierPrivilegeAuthenticator) {
pw.println();