Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb

Browse Source 
* commit 'a13732e17a0f3d69df9c418407985b3ad64b1852':
  MTP: Fix month off by one error in date parsing and formatting code
This commit is contained in:
Mike Lockwood
2011-01-26 15:32:11 -08:00
committed by Android Git Automerger
parent dde78c2b1c a13732e17a
commit bd65c065b2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/mtp/MtpUtils.cpp
View File

@@ -55,7 +55,7 @@ bool parseDateTime(const char* dateTime, time_t& outSeconds) {
tm.tm_min = minute; tm.tm_min = minute;
tm.tm_hour = hour; tm.tm_hour = hour;
tm.tm_mday = day; 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_year = year - 1900;
tm.tm_wday = 0; tm.tm_wday = 0;
tm.tm_isdst = -1; tm.tm_isdst = -1;
@@ -72,7 +72,9 @@ void formatDateTime(time_t seconds, char* buffer, int bufferLength) {
localtime_r(&seconds, &tm); localtime_r(&seconds, &tm);
snprintf(buffer, bufferLength, "%04d%02d%02dT%02d%02d%02d", 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 } // namespace android