commit a1eabcdc93d118146639139257c2f5ccc3ffb061
author Gilad Arnold <garnold@chromium.org> Wed Jul 09 15:42:40 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Jul 11 17:00:26 2014 +0000
tree b69fe72fe71b85e88b59bea85677f68bb08ddf41
parent bfc44f70a99a74bdb714c84fc65be2ab50806bab

UpdateManager: Do not schedule update checks if OOBE did not complete.

This abides by the current logic, as found in
UpdateCheckScheduler::StaticCheck().  New unit test added to verify this
behavior.

BUG=chromium:358269
TEST=Unit tests.

Change-Id: I747e8a59408d6b93ceea62ef741b36e09f937a08
Reviewed-on: https://chromium-review.googlesource.com/207241
Reviewed-by: Alex Deymo <deymo@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

update_manager/chromeos_policy.cc

diff --git a/update_manager/chromeos_policy.cc b/update_manager/chromeos_policy.cc
index adbef4f..ba3241e 100644
--- a/update_manager/chromeos_policy.cc
+++ b/update_manager/chromeos_policy.cc
@@ -156,9 +156,12 @@
   result->updates_enabled = true;
   result->target_channel.clear();
 
+  DevicePolicyProvider* const dp_provider = state->device_policy_provider();
+  SystemProvider* const system_provider = state->system_provider();
+
   // Unofficial builds should not perform any automatic update checks.
   const bool* is_official_build_p = ec->GetValue(
-      state->system_provider()->var_is_official_build());
+      system_provider->var_is_official_build());
   if (is_official_build_p && !(*is_official_build_p)) {
     result->updates_enabled = false;
     return EvalStatus::kSucceeded;
@@ -166,13 +169,21 @@
 
   // Do not perform any automatic update checks if booted from removable device.
   const bool* is_boot_device_removable_p = ec->GetValue(
-      state->system_provider()->var_is_boot_device_removable());
+      system_provider->var_is_boot_device_removable());
   if (is_boot_device_removable_p && *is_boot_device_removable_p) {
     result->updates_enabled = false;
     return EvalStatus::kSucceeded;
   }
 
-  DevicePolicyProvider* const dp_provider = state->device_policy_provider();
+  // If OOBE is enabled, wait until it is completed.
+  const bool* is_oobe_enabled_p = ec->GetValue(
+      state->config_provider()->var_is_oobe_enabled());
+  if (is_oobe_enabled_p && *is_oobe_enabled_p) {
+    const bool* is_oobe_complete_p = ec->GetValue(
+        system_provider->var_is_oobe_complete());
+    if (is_oobe_complete_p && !(*is_oobe_complete_p))
+      return EvalStatus::kAskMeAgainLater;
+  }
 
   const bool* device_policy_is_loaded_p = ec->GetValue(
       dp_provider->var_device_policy_is_loaded());
@@ -180,10 +191,8 @@
     // Check whether updates are disabled by policy.
     const bool* update_disabled_p = ec->GetValue(
         dp_provider->var_update_disabled());
-    if (update_disabled_p && *update_disabled_p) {
-      result->updates_enabled = false;
+    if (update_disabled_p && *update_disabled_p)
       return EvalStatus::kAskMeAgainLater;
-    }
 
     // Determine whether a target channel is dictated by policy.
     const bool* release_channel_delegated_p = ec->GetValue(