commit b9edfdf3bcc893ec81f061aa73ba47ce00830b68
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 22 18:39:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 18:39:09 2020 +0000
tree fdc87fac75d838344f19c31dd9bed73cb4df12f0
parent d9ba6c3f6b2eae956bba8acc6d14639e124b755d
parent bce624923fbe04a5d96b2742b941ad66937b77d4

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11930457

Change-Id: Ic892ada7502cd6712144696f1eec7eb425790b2d

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();