Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c1f1cf authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I7daa7ae8 into eclair-mr2 

* changes:
  move event log tags used by SyncAdapter into a local .logtags file
parents 159f0015 45e6dbf9

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ LOCAL_SRC_FILES += \ 
	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)

core/java/android/content/EventLogTags.logtags

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# 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)

core/java/android/content/SyncAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.accounts.Account; 
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,