summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-06-17 14:39:41 -0700
committerElliott Hughes <enh@google.com>2011-06-17 14:39:41 -0700
commitfa36aee60d353b76c14eafb63368658d9c2db96b (patch)
treeffc543d55039e85c65afdc8e9baa40e899889c67
parent18cc57fb932363f999a71815cbeb4192cba4b468 (diff)
downloadframeworks_base-fa36aee60d353b76c14eafb63368658d9c2db96b.zip
frameworks_base-fa36aee60d353b76c14eafb63368658d9c2db96b.tar.gz
frameworks_base-fa36aee60d353b76c14eafb63368658d9c2db96b.tar.bz2
Make debuggable="true" imply CheckJNI.
This should help third-party developers debug their apps. Tested by adding logging to dalvik and launching a debuggable app. Change-Id: Icec66825709e399e238b4ff00f2bc596485a3a60
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index f1098a8..4ec71c1 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -1933,6 +1933,9 @@ public final class ActivityManagerService extends ActivityManagerNative
int debugFlags = 0;
if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
debugFlags |= Zygote.DEBUG_ENABLE_DEBUGGER;
+ // Also turn on CheckJNI for debuggable apps. It's quite
+ // awkward to turn on otherwise.
+ debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;
}
// Run the app in safe mode if its manifest requests so or the
// system is booted in safe mode.