Change the vsoc RIL to use eth1, not eth0.
On the current version of cuttlefish, the backing virtio connections for
mobile and wireless connectivity are identical, but some devices such as
android auto do not have mobile connectivity. Using eth1 instead of eth0
for mobile then allows the auto configuration to always use eth0,
instead of using eth0 when there's only one connection and eth1 when
there are two.
Test: Ran cf_x86_[phone, auto]-userdebug locally.
Bug: 112047055
Change-Id: I67520aa990d58136606d2bafb9cfdba4330273ec
diff --git a/guest/hals/ril/vsoc_ril.cpp b/guest/hals/ril/vsoc_ril.cpp
index d168583..1eeff5b 100644
--- a/guest/hals/ril/vsoc_ril.cpp
+++ b/guest/hals/ril/vsoc_ril.cpp
@@ -114,7 +114,7 @@
std::unique_ptr<cvd::NetlinkClient> nl(factory->New(NETLINK_ROUTE));
std::unique_ptr<cvd::NetworkInterfaceManager> nm(
cvd::NetworkInterfaceManager::New(factory));
- std::unique_ptr<cvd::NetworkInterface> ni(nm->Open("rmnet0", "eth0"));
+ std::unique_ptr<cvd::NetworkInterface> ni(nm->Open("rmnet0", "eth1"));
if (ni) {
ni->SetName("rmnet0");
@@ -133,7 +133,7 @@
// This call returns true, if operation was successful.
bool TearDownNetworkInterface() {
auto nm(cvd::NetworkInterfaceManager::New(nullptr));
- auto ni(nm->Open("rmnet0", "eth0"));
+ auto ni(nm->Open("rmnet0", "eth1"));
if (ni) {
ni->SetOperational(false);
