commit fb2ae0daa4640bad1949eddb0524a7e3a4a3a340
author android-build-team Robot <android-build-team-robot@google.com> Tue Nov 28 23:27:14 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Nov 28 23:27:14 2017 +0000
tree d31b578add06d37926961c4d6d3cbc49e237e2b7
parent 9fe47cddff592656aca0a830301fc1288749ce2c
parent d60a814adf92dcf374343930237767303446be29

Snap for 4448085 from d60a814adf92dcf374343930237767303446be29 to oc-m3-release

Change-Id: Ie4e7f16fe705db0309ea17bc343acd19c85a5c0a

update_attempter_android.cc

diff --git a/update_attempter_android.cc b/update_attempter_android.cc
index 4ac17f5..5765329 100644
--- a/update_attempter_android.cc
+++ b/update_attempter_android.cc
@@ -197,7 +197,10 @@
           "Invalid network_id: " + headers[kPayloadPropertyNetworkId]);
     }
     if (!network_selector_->SetProcessNetwork(network_id)) {
-      LOG(WARNING) << "Unable to set network_id, continuing with the update.";
+      return LogAndSetError(
+          error,
+          FROM_HERE,
+          "Unable to set network_id: " + headers[kPayloadPropertyNetworkId]);
     }
   }