Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde7cf67 authored Dec 06, 2024 by Matt Gilbride

Fix incorrect flag for starting DynamicInstrumentationManagerService

SystemServer was previously referencing the flag
com.android.art.flags.executable_method_file_offsets, which is in the
ART (mainline) container, and can thus be set to true on pre-25Q2
devices.

The relevant SELinux policy for DynamicInstrumentationManagerService is
only present from 25Q2 onwards. Thus, the system would crash on pre-25Q2
devices with the ART flag turned on.

Correct this by useing the flag of the same name in from the
android.uprobestats package, which is in the system container and will
only be enabled from 25Q2 onwards.

Bug: 382532566
Test: TH
Flag: android.uprobestats.flags.executable_method_file_offsets
Change-Id: I66bae90e49609cd3ee7f7e7b9a64e8f82e4b8641

parent 7efd5ae7

services/core/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,6 @@ java_library_static {
		"android.hardware.vibrator-V3-java",
		"androidx.annotation_annotation",
		"app-compat-annotations",
		"art_exported_aconfig_flags_lib",
		"framework-tethering.stubs.module_lib",
		"keepanno-annotations",
		"service-art.stubs.system_server",
		@@ -247,6 +246,7 @@ java_library_static {
		"locksettings_flags_lib",
		"profiling_flags_lib",
		"android.adpf.sessionmanager_aidl-java",
		"uprobestats_flags_java_lib",
		],
		javac_shard_size: 50,
		javacflags: [

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2933,7 +2933,7 @@ public final class SystemServer implements Dumpable {
		t.traceEnd();

		// UprobeStats DynamicInstrumentationManager
		if (com.android.art.flags.Flags.executableMethodFileOffsets()) {
		if (android.uprobestats.flags.Flags.executableMethodFileOffsets()) {
		t.traceBegin("StartDynamicInstrumentationManager");
		mSystemServiceManager.startService(DynamicInstrumentationManagerService.class);
		t.traceEnd();