Merge "Introduce BinderSpamSignalCollector" into main (8091259f) · Commits · e / os / android_frameworks_base

services/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -367,6 +367,9 @@ java_library {
		] + select(release_flag("RELEASE_MOVE_VCN_TO_MAINLINE"), {
		true: [],
		default: ["service-connectivity-b-platform"],
		}) + select(release_flag("RELEASE_ANOMALY_DETECTOR"), {
		true: ["services.signal-collectors"],
		default: [],
		}),

		libs: [

services/core/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,6 @@ java_library_static {
		"android.adpf.sessionmanager_aidl-java",
		"uprobestats_flags_java_lib",
		"clipboard_flags_lib",
		"signal_collector_flags_lib",
		"aconfig_adbdauth_flags_java_lib",
		],
		javac_shard_size: 50,

services/core/java/com/android/server/signalcollector/Android.bp

deleted100644 → 0

+0 −11

Original line number	Diff line number	Diff line
		aconfig_declarations {
		name: "signal_collector_flags",
		package: "com.android.server.signalcollector",
		container: "system",
		srcs: ["flags.aconfig"],
		}

		java_aconfig_library {
		name: "signal_collector_flags_lib",
		aconfig_declarations: "signal_collector_flags",
		}

services/core/java/com/android/server/signalcollector/flags.aconfig

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		package: "com.android.server.signalcollector"
		container: "system"

		flag {
		name: "enable_binder_call_signal_collector"
		namespace: "backstage_power"
		description: "Enable binder call signal collector for anomaly detection."
		bug: "421243909"
		}

services/java/com/android/server/SystemServer.java

+10 −14

Original line number	Diff line number	Diff line
		@@ -267,7 +267,6 @@ import com.android.server.selinux.SelinuxAuditLogsService;
		import com.android.server.sensorprivacy.SensorPrivacyService;
		import com.android.server.sensors.SensorService;
		import com.android.server.serial.SerialManagerService;
		import com.android.server.signalcollector.SignalCollectorService;
		import com.android.server.signedconfig.SignedConfigService;
		import com.android.server.slice.SliceManagerService;
		import com.android.server.smartspace.SmartspaceManagerService;
		@@ -467,6 +466,8 @@ public final class SystemServer implements Dumpable {
		"/apex/com.android.profiling/javalib/service-profiling.jar";
		private static final String ANOMALY_DETECTOR_SERVICE_CLASS =
		"com.android.os.profiling.anomaly.AnomalyDetectorService";
		private static final String SIGNAL_COLLECTOR_SERVICE_CLASS =
		"com.android.server.signalcollector";

		private static final String RANGING_APEX_SERVICE_JAR_PATH =
		"/apex/com.android.uwb/javalib/service-ranging.jar";
		@@ -2974,6 +2975,14 @@ public final class SystemServer implements Dumpable {
		t.traceBegin("StartAnomalyDetectorService");
		mSystemServiceManager.startService(ANOMALY_DETECTOR_SERVICE_CLASS);
		t.traceEnd();

		t.traceBegin("StartSignalCollectorService");
		try {
		mSystemServiceManager.startService(SIGNAL_COLLECTOR_SERVICE_CLASS);
		} catch (Throwable e) {
		reportWtf("starting SignalCollectorService", e);
		}
		t.traceEnd();
		}

		if (safeMode) {
		@@ -3533,19 +3542,6 @@ public final class SystemServer implements Dumpable {
		}
		t.traceEnd();

		// TODO(b/421229308): The collector service should only be running if
		// the anomaly detection service APIs are enabled.
		// Replace this flag with the exported API flag after it's ready.
		if (com.android.server.signalcollector.Flags.enableBinderCallSignalCollector()) {
		t.traceBegin("StartSignalCollectorService");
		try {
		mSystemServiceManager.startService(SignalCollectorService.class);
		} catch (Throwable e) {
		reportWtf("starting SignalCollectorService", e);
		}
		t.traceEnd();
		}

		t.traceEnd(); // startOtherServices
		}