commit 772470ab385b5f5d748390943e5cc5db18c40374
author Sen Jiang <senj@google.com> Tue Sep 12 15:04:35 2017 -0700
committer Tao Bao <tbao@google.com> Thu Sep 14 15:06:35 2017 -0700
tree d31b578add06d37926961c4d6d3cbc49e237e2b7
parent fc110efa5219b83802f532cb2caabcef2cb69a5e

Error out if SetProcessNetwork fails.

If the network disconnected between when acquireApnNetwork succeeded
and when SetProcessNetwork is called, then the download would have
gone on the system default network.

Bug: 65562632
Test: mma
Change-Id: Ie696c77a33cec1c772650df279e67bf21d4c1b88
(cherry picked from commit cbd37c68ca69ceec25a9609c0c36fa30ee707f6d)

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]);
     }
   }