commit d544011db2537092fe4f76d238dfe3a82ad15a36
author Michal Karpinski <mkarpinski@google.com> Thu Oct 06 16:56:04 2016 +0100
committer Lorenzo Colitti <lorenzo@google.com> Thu Oct 27 18:15:49 2016 +0900
tree 11def72016b5de70d19629ca2610759ad02599a0
parent e6b936ebe8e8a9cbe47b87be0f1b72bb85a8d80d

Adding EventReporter class

This class stores the reporting level and can be used to get
the event listener service.

Bug: 29748723

(cherry picked from commit be581e228bd1a97efd179edcdd3e744622fb99b8)

Change-Id: I98bfa97cb502f4d19ccf8c79f32d347e7e168492

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index e962362..a575642 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -30,6 +30,7 @@
 
 #include "Controllers.h"
 #include "DumpWriter.h"
+#include "EventReporter.h"
 #include "InterfaceController.h"
 #include "NetdConstants.h"
 #include "NetdNativeService.h"
@@ -293,7 +294,7 @@
     ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
     ENFORCE_DEBUGGABLE();
 
-    *reportingLevel = gCtls->netCtrl.getMetricsReportingLevel();
+    *reportingLevel = gCtls->eventReporter.getMetricsReportingLevel();
     return binder::Status::ok();
 }
 
@@ -303,10 +304,9 @@
     ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
     ENFORCE_DEBUGGABLE();
 
-    if (int err = gCtls->netCtrl.setMetricsReportingLevel(reportingLevel)) {
-        return binder::Status::fromExceptionCode(binder::Status::EX_ILLEGAL_ARGUMENT);
-    }
-    return binder::Status::ok();
+    return (gCtls->eventReporter.setMetricsReportingLevel(reportingLevel) == 0)
+            ? binder::Status::ok()
+            : binder::Status::fromExceptionCode(binder::Status::EX_ILLEGAL_ARGUMENT);
 }
 
 }  // namespace net