commit aff8c12bff76e40b3330fca0c15c309724e5c0f2
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 22 18:28:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 18:28:34 2020 +0000
tree fdc87fac75d838344f19c31dd9bed73cb4df12f0
parent 0268c0139178a0b587eec6bba22336cd4a622286
parent a8c92eaae719f363a7fcd0ce917bee2de922d8b7

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

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

Change-Id: Ia7d2bdc8f01d80f764a5cc7f707ee638d99614c8

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