Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Don't enable jdwp by default on userdebug builds""

Browse Source
This commit is contained in:
Mythri Alle
2022-09-14 15:18:44 +00:00
committed by Gerrit Code Review
parent a70b3d1a46 50c258ca37
commit e6a7509dbc
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/os/Zygote.java
View File

@@ -1000,25 +1000,17 @@ 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.debuggable.dalvik.vm.jdwp.enabled").equals("1");
/** /**
* Applies debugger system properties to the zygote arguments. * Applies debugger system properties to the zygote arguments.
* *
* For eng builds all apps are debuggable. On userdebug and user builds * If "ro.debuggable" is "1", all apps are debuggable. Otherwise,
* if persist.debuggable.dalvik.vm.jdwp.enabled is 1 all apps are * the debugger state is specified via the "--enable-jdwp" flag
* debuggable. Otherwise, the debugger state is specified via the * in the spawn request.
* "--enable-jdwp" flag in the spawn request.
* *
* @param args non-null; zygote spawner args * @param args non-null; zygote spawner args
*/ */
static void applyDebuggerSystemProperty(ZygoteArguments args) { static void applyDebuggerSystemProperty(ZygoteArguments args) {
if (Build.IS_ENG || ENABLE_JDWP) { if (RoSystemProperties.DEBUGGABLE) {
args.mRuntimeFlags |= Zygote.DEBUG_ENABLE_JDWP; args.mRuntimeFlags |= Zygote.DEBUG_ENABLE_JDWP;
} }
} }