1 files changed, 16 insertions, 16 deletions

diff --git a/core/jni/fd_utils.h b/core/jni/fd_utils.h
index 2caf1575981a..dadb35233be1 100644
--- a/core/jni/fd_utils.h
+++ b/core/jni/fd_utils.h
@@ -33,42 +33,42 @@ class FileDescriptorInfo;
 // This type is duplicated in com_android_internal_os_Zygote.cpp
 typedef const std::function<void(std::string)>& fail_fn_t;
 
-// Whitelist of open paths that the zygote is allowed to keep open.
+// Allowlist of open paths that the zygote is allowed to keep open.
 //
-// In addition to the paths listed in kPathWhitelist in file_utils.cpp, and
+// In addition to the paths listed in kPathAllowlist in file_utils.cpp, and
 // paths dynamically added with Allow(), all files ending with ".jar"
-// under /system/framework" are whitelisted. See IsAllowed() for the canonical
+// under /system/framework" are allowlisted. See IsAllowed() for the canonical
 // definition.
 //
-// If the whitelisted path is associated with a regular file or a
+// If the allowlisted path is associated with a regular file or a
 // character device, the file is reopened after a fork with the same
-// offset and mode. If the whilelisted  path is associated with a
+// offset and mode. If the allowlisted path is associated with a
 // AF_UNIX socket, the socket will refer to /dev/null after each
 // fork, and all operations on it will fail.
-class FileDescriptorWhitelist {
+class FileDescriptorAllowlist {
  public:
-  // Lazily creates the global whitelist.
-  static FileDescriptorWhitelist* Get();
+  // Lazily creates the global allowlist.
+  static FileDescriptorAllowlist* Get();
 
-  // Adds a path to the whitelist.
+  // Adds a path to the allowlist.
   void Allow(const std::string& path) {
-    whitelist_.push_back(path);
+    allowlist_.push_back(path);
   }
 
-  // Returns true iff. a given path is whitelisted. A path is whitelisted
-  // if it belongs to the whitelist (see kPathWhitelist) or if it's a path
+  // Returns true iff. a given path is allowlisted. A path is allowlisted
+  // if it belongs to the allowlist (see kPathAllowlist) or if it's a path
   // under /system/framework that ends with ".jar" or if it is a system
   // framework overlay.
   bool IsAllowed(const std::string& path) const;
 
  private:
-  FileDescriptorWhitelist();
+  FileDescriptorAllowlist();
 
-  static FileDescriptorWhitelist* instance_;
+  static FileDescriptorAllowlist* instance_;
 
-  std::vector<std::string> whitelist_;
+  std::vector<std::string> allowlist_;
 
-  DISALLOW_COPY_AND_ASSIGN(FileDescriptorWhitelist);
+  DISALLOW_COPY_AND_ASSIGN(FileDescriptorAllowlist);
 };
 
 // A FileDescriptorTable is a collection of FileDescriptorInfo objects