diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-27 13:38:21 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-10-28 09:34:09 -0700 |
| commit | e24bf5d7b972597ba5b7b38ca777d8eae98332dd (patch) | |
| tree | 5e289f6e3f4b679029f425a73fab0704f03425d6 /libc/tzcode | |
| parent | f96eaf6202351a1b5153cfaad3137e4b63846f8f (diff) | |
| download | bionic-e24bf5d7b972597ba5b7b38ca777d8eae98332dd.zip bionic-e24bf5d7b972597ba5b7b38ca777d8eae98332dd.tar.gz bionic-e24bf5d7b972597ba5b7b38ca777d8eae98332dd.tar.bz2 | |
Disable tzdata in $ANDROID_DATA.
(cherry picked from 4c30130a2155c37e80af4c3b53bf4f6ce832e760.)
Bug: 18139284
Change-Id: I2670dc1791d635139a5d39a438dc08777439476b
Diffstat (limited to 'libc/tzcode')
| -rw-r--r-- | libc/tzcode/localtime.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libc/tzcode/localtime.c b/libc/tzcode/localtime.c index 3bbed90..28d13f4 100644 --- a/libc/tzcode/localtime.c +++ b/libc/tzcode/localtime.c @@ -2252,14 +2252,11 @@ static int __bionic_open_tzdata_path(const char* path_prefix_variable, const cha } static int __bionic_open_tzdata(const char* olson_id, int* data_size) { - int fd = __bionic_open_tzdata_path("ANDROID_DATA", "/misc/zoneinfo/tzdata", olson_id, data_size); - if (fd < 0) { - fd = __bionic_open_tzdata_path("ANDROID_ROOT", "/usr/share/zoneinfo/tzdata", olson_id, data_size); - if (fd == -2) { - // 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); - } + int fd = __bionic_open_tzdata_path("ANDROID_ROOT", "/usr/share/zoneinfo/tzdata", olson_id, data_size); + if (fd == -2) { + // 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; } |