From e5e0250dd23d0ff718a26350f3076884235b8c0e Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@android.com>
Date: Thu, 1 Sep 2011 10:46:14 -0700
Subject: [PATCH] Fix a calendar info query to use a constant instead of a
 string

This was causing an error when trying to query the calendar app
status from the dialer.

Change-Id: I7d5f554a96d7dc3dfed8d3fa8a0f16635a776701
---
 api/current.txt                                  | 2 +-
 core/java/android/provider/CalendarContract.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 49e928567011a..21ee1f11b4934 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15610,7 +15610,7 @@ package android.provider {
   public static final class CalendarContract.Calendars implements android.provider.BaseColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.SyncColumns {
     field public static final java.lang.String CALENDAR_LOCATION = "calendar_location";
     field public static final android.net.Uri CONTENT_URI;
-    field public static final java.lang.String DEFAULT_SORT_ORDER = "displayName";
+    field public static final java.lang.String DEFAULT_SORT_ORDER = "calendar_displayName";
     field public static final java.lang.String NAME = "name";
   }
 
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index 6fe512425750b..9ba1fdbe67b02 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -599,7 +599,7 @@ public final class CalendarContract {
         /**
          * The default sort order for this table
          */
-        public static final String DEFAULT_SORT_ORDER = "displayName";
+        public static final String DEFAULT_SORT_ORDER = CALENDAR_DISPLAY_NAME;
 
         /**
          * The name of the calendar. Column name.