Merge "Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c am: 90a56a59d5" (c9e76ed0) · Commits · e / os / android_frameworks_base

core/java/android/text/format/Time.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -358,7 +358,7 @@ public class Time {
		}

		/**
		* Return the current time in YYYYMMDDTHHMMSS<tz> format
		* Return the current time in YYYYMMDDTHHMMSS<tz> format
		*/
		@Override
		public String toString() {
		@@ -738,6 +738,7 @@ public class Time {
		* <p>
		* You should also use <tt>toMillis(false)</tt> if you want
		* to read back the same milliseconds that you set with {@link #set(long)}
		* or {@link #set(Time)} or after parsing a date string.
		*
		* <p>
		* This method can return {@code -1} when the date / time fields have been
		@@ -745,8 +746,6 @@ public class Time {
		* For example, when daylight savings transitions cause an hour to be
		* skipped: times within that hour will return {@code -1} if isDst =
		* {@code -1}.
		*
		* or {@link #set(Time)} or after parsing a date string.
		*/
		public long toMillis(boolean ignoreDst) {
		calculator.copyFieldsFromTime(this);