diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-01-26 15:30:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 15:30:07 -0800 |
| commit | f26fec6212dcada2a1ffb642afe25429d1005aa4 (patch) | |
| tree | 80ea9d624c25522378dea9e1e068d989a1edbc7a /media | |
| parent | 7757f5010a771fb8824b6fdf9788f588a1577e3f (diff) | |
| parent | ea1db0a716cc937af5371153b959610baa2c6d52 (diff) | |
| download | frameworks_av-f26fec6212dcada2a1ffb642afe25429d1005aa4.zip frameworks_av-f26fec6212dcada2a1ffb642afe25429d1005aa4.tar.gz frameworks_av-f26fec6212dcada2a1ffb642afe25429d1005aa4.tar.bz2 | |
Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
Diffstat (limited to 'media')
| -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 |