Revert "Prevent native_init from starting TrafficController" am: 2b1b2c7206
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1966612
Change-Id: I50f80ac889ee5132bf6f1e936857c57892f0db59
diff --git a/service/jni/com_android_server_BpfNetMaps.cpp b/service/jni/com_android_server_BpfNetMaps.cpp
index bde52a5..113c449 100644
--- a/service/jni/com_android_server_BpfNetMaps.cpp
+++ b/service/jni/com_android_server_BpfNetMaps.cpp
@@ -39,8 +39,7 @@
namespace android {
static void native_init(JNIEnv* env, jobject clazz) {
- // start is still being called by netd
- Status status = mTc.initMaps();
+ Status status = mTc.start();
if (!isOk(status)) {
ALOGE("%s failed", __func__);
}
diff --git a/service/native/include/TrafficController.h b/service/native/include/TrafficController.h
index 2d89344..ddcf445 100644
--- a/service/native/include/TrafficController.h
+++ b/service/native/include/TrafficController.h
@@ -32,22 +32,14 @@
using netdutils::StatusOr;
class TrafficController {
- // TODO: marking this private for right now, as start is already called by
- // netd. start() calls initMaps(), initPrograms(), and sets up the socket
- // destroy listener. Both initPrograms() and setting up the socket destroy
- // listener should only be done once.
+ public:
+ static constexpr char DUMP_KEYWORD[] = "trafficcontroller";
+
/*
* Initialize the whole controller
*/
netdutils::Status start();
- public:
- static constexpr char DUMP_KEYWORD[] = "trafficcontroller";
-
- // TODO: marking this public for right now, as start() is already called by
- // netd.
- netdutils::Status initMaps() EXCLUDES(mMutex);
-
int setCounterSet(int counterSetNum, uid_t uid, uid_t callingUid) EXCLUDES(mMutex);
/*
@@ -195,6 +187,8 @@
std::mutex mMutex;
+ netdutils::Status initMaps() EXCLUDES(mMutex);
+
// Keep track of uids that have permission UPDATE_DEVICE_STATS so we don't
// need to call back to system server for permission check.
std::set<uid_t> mPrivilegedUser GUARDED_BY(mMutex);