Merge "Fix bug #2846543 Delete HIDDEN column from the "Calendars" table" (b9b918d6) · Commits · e / os / android_frameworks_base

core/java/android/provider/Calendar.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -92,6 +92,8 @@ public final class Calendar {
		public static final String SYNC3 = "sync3";
		/** Generic column for use by sync adapters. */
		public static final String SYNC4 = "sync4";
		/** Generic column for use by sync adapters. */
		public static final String SYNC5 = "sync5";
		}

		/**
		@@ -290,11 +292,11 @@ public final class Calendar {
		DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.SYNC2);
		DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.SYNC3);
		DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.SYNC4);
		DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.SYNC5);

		DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.NAME);
		DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv,
		Calendars.DISPLAY_NAME);
		DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, Calendars.HIDDEN);
		DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, Calendars.COLOR);
		DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, ACCESS_LEVEL);
		DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, SELECTED);
		@@ -414,12 +416,6 @@ public final class Calendar {
		*/
		public static final String LOCATION = "location";

		/**
		* Should the calendar be hidden in the calendar selection panel?
		* <P>Type: INTEGER (boolean)</P>
		*/
		public static final String HIDDEN = "hidden";

		/**
		* The owner account for this calendar, based on the calendar feed.
		* This will be different from the _SYNC_ACCOUNT for delegated calendars.