From 24bfb409164aefec1a9c3c67c55ba229d70838aa Mon Sep 17 00:00:00 2001
From: Howard Ro <yro@google.com>
Date: Thu, 20 Feb 2020 04:19:41 +0000
Subject: [PATCH] Revert "Migrate Statsd to the apex"

Revert "Update statsd binary path for apex"

Revert submission 10356003-statsd_apex

Reason for revert: https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=build_test&lkgb=6221366&fkbb=6221428
Reverted Changes:
Ic84e77269:Update init.rc for statsd setup
I6f3fab4b4:Update statsd binary path for apex
Ib4ea98aed:Migrate Statsd to the apex

Change-Id: I089d5b9bbbdc363e27e79e4addd4eec1e4339c48
---
 apex/statsd/Android.bp                              | 10 ++--------
 cmds/statsd/Android.bp                              |  5 +----
 {apex => cmds}/statsd/statsd.rc                     | 12 +++++++++++-
 services/core/java/com/android/server/Watchdog.java |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename {apex => cmds}/statsd/statsd.rc (67%)

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 3b196925b91c0..0e9311034ee07 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -22,13 +22,13 @@ apex_defaults {
     native_shared_libs: [
         "libstats_jni",
     ],
-    binaries: ["statsd"],
+    // binaries: ["vold"],
     java_libs: [
         "framework-statsd",
         "service-statsd",
     ],
     compile_multilib: "both",
-    prebuilts: ["com.android.os.statsd.init.rc"],
+    // prebuilts: ["my_prebuilt"],
     name: "com.android.os.statsd-defaults",
     key: "com.android.os.statsd.key",
     certificate: ":com.android.os.statsd.certificate",
@@ -47,12 +47,6 @@ android_app_certificate {
     certificate: "com.android.os.statsd",
 }
 
-prebuilt_etc {
-    name: "com.android.os.statsd.init.rc",
-    src: "statsd.rc",
-    filename: "init.rc",
-    installable: false,
-}
 
 // JNI library for StatsLog.write
 cc_library_shared {
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 5fe64c42186fe..93522d4ff0a66 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -217,10 +217,7 @@ cc_binary {
 
     shared_libs: ["libgtest_prod"],
 
-    apex_available: [
-        "com.android.os.statsd",
-        "test_com.android.os.statsd",
-    ],
+    init_rc: ["statsd.rc"],
 }
 
 // ==============
diff --git a/apex/statsd/statsd.rc b/cmds/statsd/statsd.rc
similarity index 67%
rename from apex/statsd/statsd.rc
rename to cmds/statsd/statsd.rc
index 605da2af0c198..a98ecd586b425 100644
--- a/apex/statsd/statsd.rc
+++ b/cmds/statsd/statsd.rc
@@ -12,9 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-service statsd /apex/com.android.os.statsd/bin/statsd
+service statsd /system/bin/statsd
     class main
     socket statsdw dgram+passcred 0222 statsd statsd
     user statsd
     group statsd log
     writepid /dev/cpuset/system-background/tasks
+
+on property:ro.statsd.enable=false
+    stop statsd
+
+on post-fs-data
+    # Create directory for statsd
+    mkdir /data/misc/stats-data/ 0770 statsd system
+    mkdir /data/misc/stats-service/ 0770 statsd system
+    mkdir /data/misc/stats-active-metric/ 0770 statsd system
+    mkdir /data/misc/train-info/ 0770 statsd system
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index 8900eee6f50f3..a1ccd8459c692 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -100,7 +100,7 @@ public class Watchdog extends Thread {
         "media.codec", // vendor/bin/hw/android.hardware.media.omx@1.0-service
         "media.swcodec", // /apex/com.android.media.swcodec/bin/mediaswcodec
         "com.android.bluetooth",  // Bluetooth service
-        "/apex/com.android.os.statsd/bin/statsd",  // Stats daemon
+        "/system/bin/statsd",  // Stats daemon
     };
 
     public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList(