Merge "Don't enable jdwp by default on userdebug builds" am: 3ade15d233
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2215481 Change-Id: I88fc1b824f2d9f7cc1eeb69a0ac3a95c6fb6ec64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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.debuggable.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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user