Merge "Move libstatssocket to shared." into rvc-dev

apex/statsd/Android.bp

@@ -63,11 +63,7 @@ cc_library_shared {
     shared_libs: [
         "libnativehelper", // Has stable abi - should not be copied into apex.
         "liblog",  // Has a stable abi - should not be copied into apex.
-    ],
-    static_libs: [
-        //TODO: make shared - need libstatssocket to also live in the apex.
         "libstatssocket",
-        "libcutils", // TODO: remove - needed by libstatssocket
     ],
     //TODO: is libc++_static correct?
     stl: "libc++_static",

core/java/com/android/internal/logging/MetricsLogger.java

@@ -55,11 +55,8 @@ public class MetricsLogger {
     protected void saveLog(LogMaker log) {
         // TODO(b/116684537): Flag guard logging to event log and statsd socket.
         EventLogTags.writeSysuiMultiAction(log.serialize());
-        if (log.getCategory() != MetricsEvent.RESERVED_FOR_LOGBUILDER_COUNTER
-                && log.getCategory() != MetricsEvent.RESERVED_FOR_LOGBUILDER_HISTOGRAM) {
-            FrameworkStatsLog.write(FrameworkStatsLog.KEY_VALUE_PAIRS_ATOM,
-                    /* UID is retrieved from statsd side */ 0, log.getEntries());
-        }
+        FrameworkStatsLog.write(FrameworkStatsLog.KEY_VALUE_PAIRS_ATOM,
+                /* UID is retrieved from statsd side */ 0, log.getEntries());
     }
 
     public static final int VIEW_UNKNOWN = MetricsEvent.VIEW_UNKNOWN;

core/jni/Android.bp

@@ -208,7 +208,6 @@ cc_library_shared {
                 "libseccomp_policy",
                 "libgrallocusage",
                 "libscrypt_static",
-                "libstatssocket",
             ],
 
             shared_libs: [
@@ -266,6 +265,7 @@ cc_library_shared {
                 "libdl",
                 "libdl_android",
                 "libstatslog",
+                "libstatssocket",
                 "libtimeinstate",
                 "server_configurable_flags",
                 "libstatspull",