commit ef9a2fc1ebe2ac8e6a64347d4a4719a4df27863e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 19 17:05:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 17:05:37 2016 +0000
tree 218f80467721401122174fbb7b5d0ff09973f7cd
parent 112eb934b9100673ab02fb67e101dc9e47de6870
parent f3b640bd85e54d90f6bf244acb837efd10d5e1bd

Merge "liblog: android_log_isloggable failing apct" into nyc-dev

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index c8780bb..b77f9ad 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -537,11 +537,11 @@
     import_late(args, 2);
 
     if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {
-        property_set("vold.decrypt", "trigger_encryption");
+        ActionManager::GetInstance().QueueEventTrigger("encrypt");
     } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {
         property_set("ro.crypto.state", "encrypted");
         property_set("ro.crypto.type", "block");
-        property_set("vold.decrypt", "trigger_default_encryption");
+        ActionManager::GetInstance().QueueEventTrigger("defaultcrypto");
     } else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) {
         property_set("ro.crypto.state", "unencrypted");
         ActionManager::GetInstance().QueueEventTrigger("nonencrypted");

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 28a9b9a..f505faf 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -557,13 +557,6 @@
     class_start main
     class_start late_start
 
-on property:vold.decrypt=trigger_default_encryption
-    start defaultcrypto
-
-on property:vold.decrypt=trigger_encryption
-    start surfaceflinger
-    start encrypt
-
 on property:sys.init_log_level=*
     loglevel ${sys.init_log_level}