tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Elliott Hughes 2012-10-25 14:56:53 -07:00 committed by Gerrit Code Review
commit f2b3ac9502
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

@ -2318,7 +2318,9 @@ static int __bionic_open_tzdata(const char* olson_id, int* data_size) {
if (fd < 0) {
fd = __bionic_open_tzdata_path("/system/usr/share/zoneinfo/tzdata", olson_id, data_size);
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;