diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-01-26 14:41:45 -0800 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-01-26 15:11:48 -0800 |
| commit | ea1db0a716cc937af5371153b959610baa2c6d52 (patch) | |
| tree | 62bfc5c4b552e73d794cff0b8b27dd8274b46a77 /media/mtp | |
| parent | 2494373e91399a97ad405f4e42dff6543cc296c7 (diff) | |
| download | frameworks_av-ea1db0a716cc937af5371153b959610baa2c6d52.zip frameworks_av-ea1db0a716cc937af5371153b959610baa2c6d52.tar.gz frameworks_av-ea1db0a716cc937af5371153b959610baa2c6d52.tar.bz2 | |
MTP: Fix month off by one error in date parsing and formatting code
BUG: 3379100
Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp')
| -rw-r--r-- | media/mtp/MtpUtils.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/mtp/MtpUtils.cpp b/media/mtp/MtpUtils.cpp index ab01ef5..6ec8876 100644 --- a/media/mtp/MtpUtils.cpp +++ b/media/mtp/MtpUtils.cpp @@ -55,7 +55,7 @@ bool parseDateTime(const char* dateTime, time_t& outSeconds) { tm.tm_min = minute; tm.tm_hour = hour; tm.tm_mday = day; - tm.tm_mon = month; + tm.tm_mon = month - 1; // mktime uses months in 0 - 11 range tm.tm_year = year - 1900; tm.tm_wday = 0; tm.tm_isdst = -1; @@ -72,7 +72,9 @@ void formatDateTime(time_t seconds, char* buffer, int bufferLength) { localtime_r(&seconds, &tm); snprintf(buffer, bufferLength, "%04d%02d%02dT%02d%02d%02d", - tm.tm_year + 1900, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); + tm.tm_year + 1900, + tm.tm_mon + 1, // localtime_r uses months in 0 - 11 range + tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); } } // namespace android |