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

Commit cfcf9611 authored by Mythri Alle's avatar Mythri Alle Committed by Automerger Merge Worker
Browse files

Merge "Reland "Don't enable jdwp by default on userdebug builds""" am:... 

Merge "Reland "Don't enable jdwp by default on userdebug builds""" am: f3683fca am: a1b0512a am: 59afb30f am: e14b396e am: f973b28a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217921



Change-Id: I179d74253c1c49b522ae3a9db2f6e45677397687
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99a482c8 f973b28a

apct-tests/perftests/core/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


    <application>

        <uses-library android:name="android.test.runner" />

        <profileable android:shell="true" />

        <activity android:name="android.perftests.utils.PerfTestActivity"

            android:exported="true">

          <intent-filter>

core/java/com/android/internal/os/Zygote.java

+12 −4
Original line number Diff line number Diff line
@@ -1000,17 +1000,25 @@ public final class Zygote { 
        }

    }



    /**

     * This will enable jdwp by default for all apps. It is OK to cache this property

     * because we expect to reboot the system whenever this property changes

     */

    private static final boolean ENABLE_JDWP = SystemProperties.get(

                          "persist.debug.dalvik.vm.jdwp.enabled").equals("1");



    /**

     * Applies debugger system properties to the zygote arguments.

     *

     * If "ro.debuggable" is "1", all apps are debuggable. Otherwise,

     * the debugger state is specified via the "--enable-jdwp" flag

     * in the spawn request.

     * For eng builds all apps are debuggable. On userdebug and user builds

     * if persist.debuggable.dalvik.vm.jdwp.enabled is 1 all apps are

     * debuggable. Otherwise, the debugger state is specified via the

     * "--enable-jdwp" flag in the spawn request.

     *

     * @param args non-null; zygote spawner args

     */

    static void applyDebuggerSystemProperty(ZygoteArguments args) {

        if (RoSystemProperties.DEBUGGABLE) {

        if (Build.IS_ENG || ENABLE_JDWP) {

            args.mRuntimeFlags |= Zygote.DEBUG_ENABLE_JDWP;

        }

    }