Commit e9a8e169 authored by Neil Fuller's avatar Neil Fuller
Browse files

Fix FileUtilsTest.testCreateSubFile for Android One devices

createSubFile() was assuming that java.io.tmpdir did not
itself contain symlink. Generally true, but not for
Android One devices.

Previously the createSubFile() would have tolerated a name
parameter that directly referenced a symlink that pointed
outside of the parent dir (though not if the symlink was
actually dereferenced). This is unnecessarily lenient and
making it stricter makes the code simpler.

This fixes the FileUtils code and fixes/adds more cases to
the FileUtilsTest to confirm it all works as intended when
existing files and directories are present.

This change only affects the TzDataBundleInstaller which is
only executed in the event of an over-the-air timezone data
update.

Bug: 22836194
Change-Id: I05666c7387d469e79309a6fb0eeafba7e2a3299b
parent 6b37f0bb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment