Merge change I7daa7ae8 into eclair-mr2
* changes:
move event log tags used by SyncAdapter into a local .logtags file
diff --git a/Android.mk b/Android.mk
index 0cfae0f..f03b640 100644
--- a/Android.mk
+++ b/Android.mk
@@ -165,6 +165,8 @@
telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \
vpn/java/android/net/vpn/IVpnService.aidl \
+LOCAL_SRC_FILES += core/java/android/content/EventLogTags.logtags
+
# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
diff --git a/core/java/android/content/EventLogTags.logtags b/core/java/android/content/EventLogTags.logtags
new file mode 100644
index 0000000..af50a3c
--- /dev/null
+++ b/core/java/android/content/EventLogTags.logtags
@@ -0,0 +1,10 @@
+# See system/core/logcat/event.logtags for a description of the format of this file.
+
+option java_package android.content
+
+# ---------------------------
+# SyncAdapter.java
+# ---------------------------
+# What happens in a sync operation (bytes sent and received, and
+# operation details)
+2743 sync_details (authority|3),(send|1|2),(recv|1|2),(details|3)
diff --git a/core/java/android/content/SyncAdapter.java b/core/java/android/content/SyncAdapter.java
index af1634e..a5afe87 100644
--- a/core/java/android/content/SyncAdapter.java
+++ b/core/java/android/content/SyncAdapter.java
@@ -26,8 +26,8 @@
public abstract class SyncAdapter {
private static final String TAG = "SyncAdapter";
- /** Kernel event log tag. Also listed in data/etc/event-log-tags. */
- public static final int LOG_SYNC_DETAILS = 2743;
+ /** Kernel event log tag. */
+ public static final int LOG_SYNC_DETAILS = EventLogTags.SYNC_DETAILS;
class Transport extends ISyncAdapter.Stub {
public void startSync(ISyncContext syncContext, String authority, Account account,