commit 722beb1b8153fda6519e9af01757030e8662aa5b
author Paul Crowley <paulcrowley@google.com> Tue May 10 22:19:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 10 22:19:41 2016 +0000
tree d9c842172d33cb5aa1841de2fa8e5e7defcd78fe
parent bd4f161ae56cf4e025d212d93eb37a92acc78e96
parent fa86443064aed772ea47ff6353583f5ca9966d06

Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524
am: 71bac3fa4b

* commit '71bac3fa4b519ff9aa537a3ef6b7242b5c8f848c':
  Wipe device on policy error

Change-Id: Ie2eac0c6570a9c714f4966c054e9b41b36c09053

rootdir/init.zygote32_64.rc

diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc
index 555eda4..b50fe46 100644
--- a/rootdir/init.zygote32_64.rc
+++ b/rootdir/init.zygote32_64.rc
@@ -7,7 +7,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main

rootdir/init.zygote64_32.rc

diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc
index 46f9f02..615fe66 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -7,7 +7,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main