commit fe8aad4d653a5c63a8d4cf7dcc11efb0c6f4718d
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 22 18:12:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 22 18:12:14 2020 +0000
tree fdc87fac75d838344f19c31dd9bed73cb4df12f0
parent 5b332b3c442f332b6dc7db89ca5e6ccf79da287a
parent 4f4e77b378cc096c8257ff1d4cd9e262b341d8e2

Merge "modprobe: Use more inclusive language for libmodprobe (Part Deux)" into rvc-dev

libmodprobe/libmodprobe.cpp

diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 07504c1..5a6ae8b 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -198,8 +198,7 @@
     auto it = args.begin();
     const std::string& type = *it++;
 
-    // +Legacy
-    if ((type != "blocklist") && (type != "blacklist")) {
+    if (type != "blocklist") {
         LOG(ERROR) << "non-blocklist line encountered in modules.blocklist";
         return false;
     }
@@ -334,8 +333,6 @@
 
         auto blocklist_callback = std::bind(&Modprobe::ParseBlocklistCallback, this, _1);
         ParseCfg(base_path + "/modules.blocklist", blocklist_callback);
-        // Legacy
-        ParseCfg(base_path + "/modules.blacklist", blocklist_callback);
     }
 
     ParseKernelCmdlineOptions();