commit 91bd3e1fb49cfcf166d5183d585b14226045b71a
author Luke Huang <huangluke@google.com> Tue Aug 20 11:33:52 2019 +0800
committer Luke Huang <huangluke@google.com> Tue Aug 20 11:57:58 2019 +0000
tree 78351af9cb913b141c5bf9e1b15e007a6d66d643
parent cf6f710b67a8a5f35d47b2b20fee61395f79236d

Support enable/disable dns forwarding of dnsmasq

Bugs: 128782815
Test: built, flashed, booted
      cd systen/netd && atest

Change-Id: Id72341885d828e30296f20590c64ff614df63cee

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index ad954c7..02e9eaf 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -1992,22 +1992,30 @@
     std::vector<std::string> noDhcpRange = {};
     static const char dnsdName[] = "dnsmasq";
 
-    binder::Status status = mNetd->tetherStart(noDhcpRange);
-    EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
-    expectProcessExists(dnsdName);
+    for (bool usingLegacyDnsProxy : {true, false}) {
+        binder::Status status =
+                mNetd->tetherStartWithConfiguration(usingLegacyDnsProxy, noDhcpRange);
+        EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
+        SCOPED_TRACE(StringPrintf("usingLegacyDnsProxy: %d", usingLegacyDnsProxy));
+        if (usingLegacyDnsProxy == true) {
+            expectProcessExists(dnsdName);
+        } else {
+            expectProcessDoesNotExist(dnsdName);
+        }
 
-    bool tetherEnabled;
-    status = mNetd->tetherIsEnabled(&tetherEnabled);
-    EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
-    EXPECT_TRUE(tetherEnabled);
+        bool tetherEnabled;
+        status = mNetd->tetherIsEnabled(&tetherEnabled);
+        EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
+        EXPECT_TRUE(tetherEnabled);
 
-    status = mNetd->tetherStop();
-    EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
-    expectProcessDoesNotExist(dnsdName);
+        status = mNetd->tetherStop();
+        EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
+        expectProcessDoesNotExist(dnsdName);
 
-    status = mNetd->tetherIsEnabled(&tetherEnabled);
-    EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
-    EXPECT_FALSE(tetherEnabled);
+        status = mNetd->tetherIsEnabled(&tetherEnabled);
+        EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
+        EXPECT_FALSE(tetherEnabled);
+    }
 }
 
 TEST_F(BinderTest, TetherInterfaceAddRemoveList) {