summaryrefslogtreecommitdiffstats
path: root/apps/Development/res
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-01-27 15:10:58 -0800
committerDan Egnor <egnor@google.com>2010-01-27 15:10:58 -0800
commit4903dae035392be2fc94163d286680f647c8311f (patch)
tree63db98c5b295ed55b15aa89fc95416a78b2ded25 /apps/Development/res
parent2086587ba481163595e05197f1d1ee851b64bd16 (diff)
downloadandroid_development-4903dae035392be2fc94163d286680f647c8311f.tar.gz
android_development-4903dae035392be2fc94163d286680f647c8311f.tar.bz2
android_development-4903dae035392be2fc94163d286680f647c8311f.zip
Add a native crash facility to Bad Behavior.
Diffstat (limited to 'apps/Development/res')
-rw-r--r--apps/Development/res/layout/bad_behavior.xml5
-rw-r--r--apps/Development/res/values/strings.xml1
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/Development/res/layout/bad_behavior.xml b/apps/Development/res/layout/bad_behavior.xml
index e7477ec8d..abd863f3d 100644
--- a/apps/Development/res/layout/bad_behavior.xml
+++ b/apps/Development/res/layout/bad_behavior.xml
@@ -34,6 +34,11 @@
android:layout_height="wrap_content"
android:text="@string/bad_behavior_crash_thread_label" />
+ <Button android:id="@+id/bad_behavior_crash_native"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/bad_behavior_crash_native_label" />
+
<Button android:id="@+id/bad_behavior_wtf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml
index 538741f49..b1310f497 100644
--- a/apps/Development/res/values/strings.xml
+++ b/apps/Development/res/values/strings.xml
@@ -199,6 +199,7 @@
<string name="bad_behavior_crash_system_label">Crash the system server</string>
<string name="bad_behavior_crash_main_label">Crash the main app thread</string>
<string name="bad_behavior_crash_thread_label">Crash an auxiliary app thread</string>
+ <string name="bad_behavior_crash_native_label">Crash the native process</string>
<string name="bad_behavior_wtf_label">Report a WTF condition</string>
<string name="bad_behavior_anr_label">ANR (Stop responding for 20 seconds)</string>
<string name="bad_behavior_anr_activity_label">ANR launching a new Activity</string>