summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-01-07 10:08:19 -0800
committerDan Egnor <egnor@google.com>2010-01-07 19:10:43 -0800
commit6e70912bd53aaa5264259e160eb2b4d2eb0f302c (patch)
treeeab23ab6e33add58cc05a936520f8670ab08fed3 /core
parentedc5189c33de03f3e2f5f73edc0e007992b933c9 (diff)
downloadframeworks_base-6e70912bd53aaa5264259e160eb2b4d2eb0f302c.zip
frameworks_base-6e70912bd53aaa5264259e160eb2b4d2eb0f302c.tar.gz
frameworks_base-6e70912bd53aaa5264259e160eb2b4d2eb0f302c.tar.bz2
Bumper un-@hide (un-@pending actually) of previously reviewed APIs:
- new Log methods for reportable conditions - EventLog publication, EventLogTags deprecation - a new stackTrace field in ProcessErrorStateInfo
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/ActivityManager.java1
-rw-r--r--core/java/android/util/EventLog.java2
-rw-r--r--core/java/android/util/EventLogTags.java4
-rw-r--r--core/java/android/util/Log.java3
4 files changed, 2 insertions, 8 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 930ab65..932ad53 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -622,7 +622,6 @@ public class ActivityManager {
/**
* The stack trace where the error originated. May be null.
- * @pending
*/
public String stackTrace;
diff --git a/core/java/android/util/EventLog.java b/core/java/android/util/EventLog.java
index a5029c0..b596d32 100644
--- a/core/java/android/util/EventLog.java
+++ b/core/java/android/util/EventLog.java
@@ -40,8 +40,6 @@ import java.util.regex.Pattern;
* <p>Events use integer tag codes corresponding to /system/etc/event-log-tags.
* They carry a payload of one or more int, long, or String values. The
* event-log-tags file defines the payload contents for each type code.
- *
- * @pending
*/
public class EventLog {
private static final String TAG = "EventLog";
diff --git a/core/java/android/util/EventLogTags.java b/core/java/android/util/EventLogTags.java
index 075c84e..5cf5332 100644
--- a/core/java/android/util/EventLogTags.java
+++ b/core/java/android/util/EventLogTags.java
@@ -26,8 +26,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * to-be-deprecated: This class is no longer functional.
- * Use {to-be-link android.util.EventLog} instead.
+ * @deprecated This class is no longer functional.
+ * Use {@link android.util.EventLog} instead.
*/
public class EventLogTags {
public static class Description {
diff --git a/core/java/android/util/Log.java b/core/java/android/util/Log.java
index 7a959a6..75b1b90 100644
--- a/core/java/android/util/Log.java
+++ b/core/java/android/util/Log.java
@@ -234,7 +234,6 @@ public final class Log {
* immediately with an error dialog.
* @param tag Used to identify the source of a log message.
* @param msg The message you would like logged.
- * @pending
*/
public static int wtf(String tag, String msg) {
return wtf(tag, msg, null);
@@ -245,7 +244,6 @@ public final class Log {
* Similar to {@link #wtf(String, String)}, with an exception to log.
* @param tag Used to identify the source of a log message.
* @param tr An exception to log.
- * @pending
*/
public static int wtf(String tag, Throwable tr) {
return wtf(tag, tr.getMessage(), tr);
@@ -257,7 +255,6 @@ public final class Log {
* @param tag Used to identify the source of a log message.
* @param msg The message you would like logged.
* @param tr An exception to log. May be null.
- * @pending
*/
public static int wtf(String tag, String msg, Throwable tr) {
tr = new TerribleFailure(msg, tr);