generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am f2b3ac95: Merge "Fix recovery: don\'t assert if there\'s no tzdata."

Browse Source 
* commit 'f2b3ac9502e08ef53d4eedd7e93ea9a00d185055':
  Fix recovery: don't assert if there's no tzdata.
This commit is contained in:
Elliott Hughes 2012-10-25 15:09:29 -07:00 committed by Android Git Automerger
commit 85819efe8f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/tzcode/localtime.c
View File

@ -2271,7 +2271,9 @@ static int __bionic_open_tzdata(const char* olson_id, int* data_size) {
if (fd < 0) { if (fd < 0) {
fd = __bionic_open_tzdata_path("/system/usr/share/zoneinfo/tzdata", olson_id, data_size); fd = __bionic_open_tzdata_path("/system/usr/share/zoneinfo/tzdata", olson_id, data_size);
if (fd == -2) { if (fd == -2) {
__assert2(__FILE__, __LINE__, __func__, "couldn't find any tzdata!"); // The first thing that 'recovery' does is try to format the current time. It doesn't have
// any tzdata available, so we must not abort here --- doing so breaks the recovery image!
fprintf(stderr, "%s: couldn't find any tzdata when looking for %s!\n", __FUNCTION__, olson_id);
} }
} }
return fd; return fd;