commit 40f2faadc10f7b4b549dfd32c5bc1c7c2033ca48
author Erik Pasternak <roboerik@android.com> Thu Sep 01 13:31:39 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 01 13:31:39 2011 -0700
tree 2fbf426881051a67ca7db4bce942d2429d553256
parent 2523a6016a9a3d5626e041aa742e982870aecd5d
parent e5e0250dd23d0ff718a26350f3076884235b8c0e

Merge "Fix a calendar info query to use a constant instead of a string"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 49e9285..21ee1f1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15610,7 +15610,7 @@
   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";
   }
 

core/java/android/provider/CalendarContract.java

diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index 6fe5124..9ba1fdb 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -599,7 +599,7 @@
         /**
          * 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.