summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Egnor <egnor@google.com> 2009-10-08 20:24:20 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2009-10-08 20:24:20 -0700
commite9d8f545bf0ae577733c6aefc0f7cb671f61af5e (patch)
treeeea2ece43d9e53c453c544a1d7fce74c37d1766e
parentc93b88cf5fddb30d3f600cee51dc32a1a602a8b1 (diff)
parent6903d5cedcffa005818c497f672cf16c2dff619c (diff)
am 6903d5ce: Merge change Iee649a81 into eclair
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2 * commit '6903d5cedcffa005818c497f672cf16c2dff619c': Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
-rw-r--r--core/java/android/provider/Settings.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 2ca17f6f43bd..8c9581d0e1cc 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3621,6 +3621,11 @@ public final class Settings {
public static final String SEND_ACTION_APP_ERROR = "send_action_app_error";
/**
+ * Maximum size of /proc/last_kmsg content to upload after reboot.
+ */
+ public static final String LAST_KMSG_KB = "last_kmsg_kb";
+
+ /**
* @deprecated
* @hide
*/