diff options
| -rw-r--r-- | api/current.xml | 243 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 1 | ||||
| -rw-r--r-- | core/java/android/util/EventLog.java | 2 | ||||
| -rw-r--r-- | core/java/android/util/EventLogTags.java | 4 | ||||
| -rw-r--r-- | core/java/android/util/Log.java | 3 |
5 files changed, 244 insertions, 9 deletions
diff --git a/api/current.xml b/api/current.xml index 2fbb03d..efad051 100644 --- a/api/current.xml +++ b/api/current.xml @@ -17853,6 +17853,16 @@ visibility="public" > </field> +<field name="stackTrace" + type="java.lang.String" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="tag" type="java.lang.String" transient="false" @@ -157695,14 +157705,198 @@ > </field> </class> -<class name="EventLogTags" +<class name="EventLog" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="EventLog" + type="android.util.EventLog" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="getTagCode" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="name" type="java.lang.String"> +</parameter> +</method> +<method name="getTagName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="int"> +</parameter> +</method> +<method name="readEvents" + return="void" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tags" type="int[]"> +</parameter> +<parameter name="output" type="java.util.Collection<android.util.EventLog.Event>"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> +</method> +<method name="writeEvent" + return="int" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="int"> +</parameter> +<parameter name="value" type="int"> +</parameter> +</method> +<method name="writeEvent" + return="int" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="int"> +</parameter> +<parameter name="value" type="long"> +</parameter> +</method> +<method name="writeEvent" + return="int" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="int"> +</parameter> +<parameter name="str" type="java.lang.String"> +</parameter> +</method> +<method name="writeEvent" + return="int" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="int"> +</parameter> +<parameter name="list" type="java.lang.Object..."> +</parameter> +</method> +</class> +<class name="EventLog.Event" extends="java.lang.Object" abstract="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<method name="getData" + return="java.lang.Object" + abstract="false" + native="false" + synchronized="true" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getProcessId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getTag" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getThreadId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getTimeNanos" + return="long" + abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > +</method> +</class> +<class name="EventLogTags" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="deprecated" + visibility="public" +> <constructor name="EventLogTags" type="android.util.EventLogTags" static="false" @@ -158083,6 +158277,53 @@ <parameter name="tr" type="java.lang.Throwable"> </parameter> </method> +<method name="wtf" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="java.lang.String"> +</parameter> +<parameter name="msg" type="java.lang.String"> +</parameter> +</method> +<method name="wtf" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="java.lang.String"> +</parameter> +<parameter name="tr" type="java.lang.Throwable"> +</parameter> +</method> +<method name="wtf" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="tag" type="java.lang.String"> +</parameter> +<parameter name="msg" type="java.lang.String"> +</parameter> +<parameter name="tr" type="java.lang.Throwable"> +</parameter> +</method> <field name="ASSERT" type="int" transient="false" 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); |