commit cbd37c68ca69ceec25a9609c0c36fa30ee707f6d
author Sen Jiang <senj@google.com> Tue Sep 12 15:04:35 2017 -0700
committer Sen Jiang <senj@google.com> Tue Sep 12 15:04:35 2017 -0700
tree 02a3d9e1e420093c9b4deab68ac925ebff5e4cfd
parent a48f630400429ca010c5462967607985f2ffa7e4

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

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