Skip to content

Commit ebd5e25

Browse files
committed
Fix wording to comply with respectful-code
https://source.android.com/setup/contribute/respectful-code Test: Run unit tests Change-Id: Ia6647c9cf3224b962286151932118093b9ad979a
1 parent f5baff4 commit ebd5e25

7 files changed

+9
-9
lines changed

boot_control_chromeos.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class BootControlChromeOS : public BootControlInterface {
8282

8383
// Extracts DLC module ID and package ID from partition name. The structure of
8484
// the partition name is dlc/<dlc-id>/<dlc-package>. For example:
85-
// dlc/dummy-dlc/dummy-package
85+
// dlc/fake-dlc/fake-package
8686
bool ParseDlcPartitionName(const std::string partition_name,
8787
std::string* dlc_id,
8888
std::string* dlc_package) const;

hardware_chromeos.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace {
4747
const char kOOBECompletedMarker[] = "/home/chronos/.oobe_completed";
4848

4949
// The stateful directory used by update_engine to store powerwash-safe files.
50-
// The files stored here must be whitelisted in the powerwash scripts.
50+
// The files stored here must be safelisted in the powerwash scripts.
5151
const char kPowerwashSafeDirectory[] =
5252
"/mnt/stateful_partition/unencrypted/preserve";
5353

omaha_request_action.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ int OmahaRequestAction::GetInstallDate(SystemState* system_state) {
351351
// If we have the value stored on disk, just return it.
352352
int64_t stored_value;
353353
if (prefs->GetInt64(kPrefsInstallDateDays, &stored_value)) {
354-
// Convert and sanity-check.
354+
// Convert and validity-check.
355355
int install_date_days = static_cast<int>(stored_value);
356356
if (install_date_days >= 0)
357357
return install_date_days;

omaha_request_builder_xml.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ string OmahaRequestBuilderXml::GetCohortArg(const string arg_name,
216216
if (!prefs_->GetString(prefs_key, &cohort_value) || cohort_value.empty())
217217
return "";
218218
}
219-
// This is a sanity check to avoid sending a huge XML file back to Ohama due
219+
// This is a validity check to avoid sending a huge XML file back to Ohama due
220220
// to a compromised stateful partition making the update check fail in low
221221
// network environments envent after a reboot.
222222
if (cohort_value.size() > 1024) {

omaha_request_params.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ class OmahaRequestParams {
328328
bool ToMoreStableChannel() const;
329329

330330
// Returns True if we should store the fw/ec versions based on our hwid_.
331-
// Compares hwid to a set of whitelisted prefixes.
331+
// Compares hwid to a set of safelisted prefixes.
332332
bool CollectECFWVersions() const;
333333

334334
// Gets the machine type (e.g. "i686").

payload_state.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,14 +366,14 @@ class PayloadState : public PayloadStateInterface {
366366
// check where policy was available. This info is preserved over powerwash.
367367
void LoadRollbackHappened();
368368

369-
// Loads the blacklisted version from our prefs file.
369+
// Loads the blocklisted version from our prefs file.
370370
void LoadRollbackVersion();
371371

372372
// Blacklists this version from getting AU'd to until we receive a new update
373373
// response.
374374
void SetRollbackVersion(const std::string& rollback_version);
375375

376-
// Clears any blacklisted version.
376+
// Clears any blocklisted version.
377377
void ResetRollbackVersion();
378378

379379
inline uint32_t GetUrlIndex() {
@@ -565,7 +565,7 @@ class PayloadState : public PayloadStateInterface {
565565
// forced updates to avoid update-rollback loops.
566566
bool rollback_happened_;
567567

568-
// This stores a blacklisted version set as part of rollback. When we rollback
568+
// This stores a blocklisted version set as part of rollback. When we rollback
569569
// we store the version of the os from which we are rolling back from in order
570570
// to guarantee that we do not re-update to it on the next au attempt after
571571
// reboot.

payload_state_unittest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ TEST(PayloadStateTest, RollbackVersion) {
10161016
NiceMock<MockPrefs>* mock_powerwash_safe_prefs =
10171017
fake_system_state.mock_powerwash_safe_prefs();
10181018

1019-
// Mock out the os version and make sure it's blacklisted correctly.
1019+
// Mock out the os version and make sure it's blocklisted correctly.
10201020
string rollback_version = "2345.0.0";
10211021
OmahaRequestParams params(&fake_system_state);
10221022
params.Init(rollback_version, "", false);

0 commit comments

Comments
 (0)