commit 7720e4a569eacecce3d8c02ecdc023907e6c4c87
author Luke Huang <huangluke@google.com> Wed Feb 20 15:09:28 2019 +0800
committer Luke Huang <huangluke@google.com> Wed Apr 24 18:31:41 2019 +0800
tree f60bed9175cdcae4a4a93b9dc4474526abe778b0
parent efe0c6f21b1abc5a8d3039e9d6085642078408ae

Refactor CommandListener to binder version for preparing ndc

1. Remove unused command
2. use binder call instead of calling controller

Bug: 65862741
Test: built, flashed, booted
Change-Id: I43aa4cd04beb3429f3135edc987e8f8d122bc0a1

server/main.cpp

diff --git a/server/main.cpp b/server/main.cpp
index 9d38ed2..45b968d 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -130,6 +130,17 @@
     gCtls = new android::net::Controllers();
     gCtls->init();
 
+    // NetdNativeService must start before CommandListener.
+    // TODO: put NetdNativeService starting back after subsystems started
+    // after migrating CommandListener to NDC, aosp/929861.
+    Stopwatch subTime;
+    status_t ret;
+    if ((ret = NetdNativeService::start()) != android::OK) {
+        ALOGE("Unable to start NetdNativeService: %d", ret);
+        exit(1);
+    }
+    gLog.info("Registering NetdNativeService: %.1fms", subTime.getTimeAndReset());
+
     CommandListener cl;
     nm->setBroadcaster((SocketListener *) &cl);
 
@@ -176,14 +187,6 @@
         exit(1);
     }
 
-    Stopwatch subTime;
-    status_t ret;
-    if ((ret = NetdNativeService::start()) != android::OK) {
-        ALOGE("Unable to start NetdNativeService: %d", ret);
-        exit(1);
-    }
-    gLog.info("Registering NetdNativeService: %.1fms", subTime.getTimeAndReset());
-
     /*
      * Now that we're up, we can respond to commands. Starting the listener also tells
      * NetworkManagementService that we are up and that our binder interface is ready.