commit 33a92794a33ceacc5b8f6fbee2b479fb1a1aa831
author Luke Huang <huangluke@google.com> Tue May 28 16:59:25 2019 +0800
committer Luke Huang <huangluke@google.com> Tue May 28 16:16:39 2019 +0000
tree c71646733a55c236597ad40c6d73992154982bc2
parent 3e779a72aca6f6e079a84f548a2d3528338c569d

Temporarily disable NetworkPermissionDefault in cuttlefish and tiny fix

This test is broken since ab/5604620.
So disable for now, and wait for real solution.

Also a tiny change for fixing wrong result description of NDC command.
(ndc network default set netid)

Bug: 133653863
Bug: 133714377
Test: built, flashed, booted
          system/netd/tests/runtests.sh
      Run test case "NetworkPermissionDefault" manually in cuttlefish
      to verify that the test is skipped.

Change-Id: I37c48f119a7e0293b00582234cf7d716baf08e7a

server/NdcDispatcher.cpp

diff --git a/server/NdcDispatcher.cpp b/server/NdcDispatcher.cpp
index 05ea709..7692a9c 100644
--- a/server/NdcDispatcher.cpp
+++ b/server/NdcDispatcher.cpp
@@ -1109,7 +1109,7 @@
         } else if (strcmp(argv[2], "clear")) {
             return syntaxError(cli, "Unknown argument");
         }
-        if (Status status = mNetd->networkSetDefault(netId); status.isOk()) {
+        if (Status status = mNetd->networkSetDefault(netId); !status.isOk()) {
             return operationError(cli, "setDefaultNetwork() failed",
                                   status.serviceSpecificErrorCode());
         }