Update language to comply with Android's inclusive language guidance
More details in: https://source.android.com/setup/contribute/respectful-code
Bug: 161896447
Test: build, run unittests
Change-Id: I8d666eee75490146eb57a183f0cfdf343b58b602
diff --git a/excluder_chromeos_unittest.cc b/excluder_chromeos_unittest.cc
index a8c14b3..dba77e4 100644
--- a/excluder_chromeos_unittest.cc
+++ b/excluder_chromeos_unittest.cc
@@ -29,7 +29,7 @@
namespace chromeos_update_engine {
-constexpr char kDummyHash[] =
+constexpr char kFakeHash[] =
"71ff43d76e2488e394e46872f5b066cc25e394c2c3e3790dd319517883b33db1";
class ExcluderChromeOSTest : public ::testing::Test {
@@ -47,20 +47,20 @@
};
TEST_F(ExcluderChromeOSTest, ExclusionCheck) {
- EXPECT_FALSE(excluder_->IsExcluded(kDummyHash));
- EXPECT_TRUE(excluder_->Exclude(kDummyHash));
- EXPECT_TRUE(excluder_->IsExcluded(kDummyHash));
+ EXPECT_FALSE(excluder_->IsExcluded(kFakeHash));
+ EXPECT_TRUE(excluder_->Exclude(kFakeHash));
+ EXPECT_TRUE(excluder_->IsExcluded(kFakeHash));
}
TEST_F(ExcluderChromeOSTest, ResetFlow) {
EXPECT_TRUE(excluder_->Exclude("abc"));
- EXPECT_TRUE(excluder_->Exclude(kDummyHash));
+ EXPECT_TRUE(excluder_->Exclude(kFakeHash));
EXPECT_TRUE(excluder_->IsExcluded("abc"));
- EXPECT_TRUE(excluder_->IsExcluded(kDummyHash));
+ EXPECT_TRUE(excluder_->IsExcluded(kFakeHash));
EXPECT_TRUE(excluder_->Reset());
EXPECT_FALSE(excluder_->IsExcluded("abc"));
- EXPECT_FALSE(excluder_->IsExcluded(kDummyHash));
+ EXPECT_FALSE(excluder_->IsExcluded(kFakeHash));
}
} // namespace chromeos_update_engine
diff --git a/payload_generator/payload_file.h b/payload_generator/payload_file.h
index 0c3e9d5..d1f8196 100644
--- a/payload_generator/payload_file.h
+++ b/payload_generator/payload_file.h
@@ -60,9 +60,9 @@
// Computes a SHA256 hash of the given buf and sets the hash value in the
// operation so that update_engine could verify. This hash should be set
// for all operations that have a non-zero data blob. One exception is the
- // dummy operation for signature blob because the contents of the signature
+ // fake operation for signature blob because the contents of the signature
// blob will not be available at payload creation time. So, update_engine will
- // gracefully ignore the dummy signature operation.
+ // gracefully ignore the fake signature operation.
static bool AddOperationHash(InstallOperation* op, const brillo::Blob& buf);
// Install operations in the manifest may reference data blobs, which
diff --git a/payload_generator/payload_signer.cc b/payload_generator/payload_signer.cc
index 7e5fd4e..c3264c1 100644
--- a/payload_generator/payload_signer.cc
+++ b/payload_generator/payload_signer.cc
@@ -82,7 +82,7 @@
// Given an unsigned payload under |payload_path| and the |payload_signature|
// and |metadata_signature| generates an updated payload that includes the
// signatures. It populates |out_metadata_size| with the size of the final
-// manifest after adding the dummy signature operation, and
+// manifest after adding the fake signature operation, and
// |out_signatures_offset| with the expected offset for the new blob, and
// |out_metadata_signature_size| which will be size of |metadata_signature|
// if the payload major version supports metadata signature, 0 otherwise.
diff --git a/payload_generator/payload_signer.h b/payload_generator/payload_signer.h
index 06e4823..9676b71 100644
--- a/payload_generator/payload_signer.h
+++ b/payload_generator/payload_signer.h
@@ -62,7 +62,7 @@
// size in |metadata_signature_size| and signatures offset in
// |signatures_offset|, calculates the payload signature blob into
// |out_serialized_signature|. Note that the payload must already have an
- // updated manifest that includes the dummy signature op and correct metadata
+ // updated manifest that includes the fake signature op and correct metadata
// signature size in header. Returns true on success, false otherwise.
static bool SignPayload(const std::string& unsigned_payload_path,
const std::vector<std::string>& private_key_paths,
@@ -92,7 +92,7 @@
brillo::Blob* out_payload_hash_data,
brillo::Blob* out_metadata_hash);
- // Given an unsigned payload in |payload_path| (with no dummy signature op)
+ // Given an unsigned payload in |payload_path| (with no fake signature op)
// and the raw |payload_signatures| and |metadata_signatures| updates the
// payload to include the signature thus turning it into a signed payload. The
// new payload is stored in |signed_payload_path|. |payload_path| and