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

Commit 0bdaad88 authored by Matt Gilbride's avatar Matt Gilbride Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect flag for starting DynamicInstrumentationManagerService" into main

parents 7084a4d9 bde7cf67

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();