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

Commit 40f2faad authored by Erik Pasternak's avatar Erik Pasternak Committed by Android (Google) Code Review
Browse files

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

parents 2523a601 e5e0250d

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 {

  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 java.lang.String CALENDAR_LOCATION = "calendar_location";

    field public static final android.net.Uri CONTENT_URI;

    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";

    field public static final java.lang.String NAME = "name";

  }

  }































core/java/android/provider/CalendarContract.java



+1
−1






























Original line number
Original line
Diff line number
Diff line








@@ -599,7 +599,7 @@ public final class CalendarContract {









        /**







        /**











         * The default sort order for this table







         * 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.







         * The name of the calendar. Column name.