From 53becd92b59c4485624a1d4d09da4f64ea73dd6c Mon Sep 17 00:00:00 2001
From: Ken Shirriff <kens@google.com>
Date: Mon, 11 Jan 2010 16:54:27 -0800
Subject: [PATCH] Fix calendar sync_account / type constants to be consistent.

The EventsEntity names need to match the rest of the Calendar names.
---
 core/java/android/provider/Calendar.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index 7f947e93207e9..509aac56f37c5 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -583,14 +583,14 @@ public final class Calendar {
          * {@link #ACCOUNT_TYPE} identifies a specific account.
          * <P>Type: TEXT</P>
          */
-        public static final String ACCOUNT_NAME = "account_name";
+        public static final String ACCOUNT_NAME = "_sync_account";
 
         /**
          * The type of account to which this row belongs, which when paired with
          * {@link #ACCOUNT_NAME} identifies a specific account.
          * <P>Type: TEXT</P>
          */
-        public static final String ACCOUNT_TYPE = "account_type";
+        public static final String ACCOUNT_TYPE = "_sync_account_type";
 
         public static EntityIterator newEntityIterator(Cursor cursor, ContentResolver resolver) {
             return new EntityIteratorImpl(cursor, resolver);