summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Matt Gilbride <mattgilbride@google.com> 2024-12-06 16:45:29 +0000
committer Matt Gilbride <mattgilbride@google.com> 2024-12-06 19:11:13 +0000
commitbde7cf67464b8b1b8d47b930265f4aa4cbd1fa95 (patch)
tree5531c4f326cf1ecd20696a1b7c0ebb3e34d286b0 /services/java
parent7efd5ae7fa21ca6212d1019183ea6baccd641967 (diff)
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
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 65315af45486..92dbf63b3cf7 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -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();