diff options
Diffstat (limited to 'toolkit/components/osfile')
3 files changed, 25 insertions, 37 deletions
diff --git a/toolkit/components/osfile/modules/osfile_async_front.jsm b/toolkit/components/osfile/modules/osfile_async_front.jsm index 9f3b7fb21..698ac8732 100644 --- a/toolkit/components/osfile/modules/osfile_async_front.jsm +++ b/toolkit/components/osfile/modules/osfile_async_front.jsm @@ -728,26 +728,19 @@ File.prototype = { } }; - -if (SharedAll.Constants.Sys.Name != "Android") { - /** - * Set the last access and modification date of the file. - * The time stamp resolution is 1 second at best, but might be worse - * depending on the platform. - * - * WARNING: This method is not implemented on Android. On Android, - * you should use File.setDates instead. - * - * @return {promise} - * @rejects {TypeError} - * @rejects {OS.File.Error} - */ - File.prototype.setDates = function(accessDate, modificationDate) { - return Scheduler.post("File_prototype_setDates", - [this._fdmsg, accessDate, modificationDate], this); - }; -} - + /** + * Set the last access and modification date of the file. + * The time stamp resolution is 1 second at best, but might be worse + * depending on the platform. + * + * @return {promise} + * @rejects {TypeError} + * @rejects {OS.File.Error} + */ +File.prototype.setDates = function(accessDate, modificationDate) { + return Scheduler.post("File_prototype_setDates", + [this._fdmsg, accessDate, modificationDate], this); +}; /** * Open a file asynchronously. diff --git a/toolkit/components/osfile/modules/osfile_unix_back.jsm b/toolkit/components/osfile/modules/osfile_unix_back.jsm index 7c2c6f28d..4cc444567 100644 --- a/toolkit/components/osfile/modules/osfile_unix_back.jsm +++ b/toolkit/components/osfile/modules/osfile_unix_back.jsm @@ -372,14 +372,14 @@ // Two variants of |getwd| which allocate the memory // dynamically. - // Linux/Android version + // Linux version libc.declareLazyFFI(SysFile, "get_current_dir_name", "get_current_dir_name", ctypes.default_abi, /*return*/ Type.out_path.releaseWithLazy(() => SysFile.free )); - // MacOS/BSD version (will return NULL on Linux/Android) + // MacOS/BSD version (will return NULL on Linux) libc.declareLazyFFI(SysFile, "getwd_auto", "getwd", ctypes.default_abi, /*return*/ Type.out_path.releaseWithLazy(() => @@ -520,13 +520,13 @@ /*fd_out*/ Type.fd, /*off_out*/Type.off_t.in_ptr, /*len*/ Type.size_t, - /*flags*/ Type.unsigned_int); // Linux/Android-specific + /*flags*/ Type.unsigned_int); // Linux-specific libc.declareLazyFFI(SysFile, "statfs", "statfs", ctypes.default_abi, /*return*/ Type.negativeone_or_nothing, /*path*/ Type.path, - /*buf*/ Type.statvfs.out_ptr); // Android,B2G + /*buf*/ Type.statvfs.out_ptr); // Other platforms libc.declareLazyFFI(SysFile, "statvfs", "statvfs", ctypes.default_abi, diff --git a/toolkit/components/osfile/modules/osfile_unix_front.jsm b/toolkit/components/osfile/modules/osfile_unix_front.jsm index bd60d4d84..4e41036df 100644 --- a/toolkit/components/osfile/modules/osfile_unix_front.jsm +++ b/toolkit/components/osfile/modules/osfile_unix_front.jsm @@ -204,10 +204,7 @@ * The time stamp resolution is 1 second at best, but might be worse * depending on the platform. * - * WARNING: This method is not implemented on Android/B2G. On Android/B2G, - * you should use File.setDates instead. - * - * @param {Date,number=} accessDate The last access date. If numeric, + * @param {Date,number=} accessDate The last access date. If numeric, * milliseconds since epoch. If omitted or null, then the current date * will be used. * @param {Date,number=} modificationDate The last modification date. If @@ -217,14 +214,12 @@ * @throws {TypeError} In case of invalid parameters. * @throws {OS.File.Error} In case of I/O error. */ - if (SharedAll.Constants.Sys.Name != "Android") { - File.prototype.setDates = function(accessDate, modificationDate) { - let {value, ptr} = datesToTimevals(accessDate, modificationDate); - throw_on_negative("setDates", - UnixFile.futimes(this.fd, ptr), - this._path); - }; - } + File.prototype.setDates = function(accessDate, modificationDate) { + let {value, ptr} = datesToTimevals(accessDate, modificationDate); + throw_on_negative("setDates", + UnixFile.futimes(this.fd, ptr), + this._path); + }; /** * Flushes the file's buffers and causes all buffered data @@ -576,7 +571,7 @@ if (UnixFile.splice) { const BUFSIZE = 1 << 17; - // An implementation of |pump| using |splice| (for Linux/Android) + // An implementation of |pump| using |splice| (for Linux) pump = function pump_splice(source, dest, options = {}) { let nbytes = options.nbytes > 0 ? options.nbytes : Infinity; let pipe = []; |