diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:41:09 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:41:09 +0000 |
| commit | 5cb4bd06af989391a4523e74ea44b6b6a0302d96 (patch) | |
| tree | 7cba5142c32d63832179c2cafc9b02ddec4d8765 | |
| parent | 271398ad50d3e5df389b61954c29c92109a927f5 (diff) | |
| parent | 9885851f626081c27131d482115c9b656688beaa (diff) | |
| download | bootable_recovery-5cb4bd06af989391a4523e74ea44b6b6a0302d96.zip bootable_recovery-5cb4bd06af989391a4523e74ea44b6b6a0302d96.tar.gz bootable_recovery-5cb4bd06af989391a4523e74ea44b6b6a0302d96.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
| -rw-r--r-- | etc/init.rc | 6 | ||||
| -rw-r--r-- | uncrypt/uncrypt.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/init.rc b/etc/init.rc index 6c07c60..4277277 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -47,8 +47,8 @@ on boot class_start default # Load properties from /system/ + /factory after fs mount. -on load_all_props_action - load_all_props +on load_system_props_action + load_system_props on firmware_mounts_complete rm /dev/.booting @@ -63,7 +63,7 @@ on late-init # Load properties from /system/ + /factory after fs mount. Place # this in another action so that the load will be scheduled after the prior # issued fs triggers have completed. - trigger load_all_props_action + trigger load_system_props_action # Remove a file to wake up anything waiting for firmware trigger firmware_mounts_complete diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 1db3013..46da86d 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -144,7 +144,7 @@ static const char* find_block_device(const char* path, bool* encryptable, bool* (path[len] == '/' || path[len] == 0)) { *encrypted = false; *encryptable = false; - if (fs_mgr_is_encryptable(v)) { + if (fs_mgr_is_encryptable(v) || fs_mgr_is_file_encrypted(v)) { *encryptable = true; char buffer[PROPERTY_VALUE_MAX+1]; if (property_get("ro.crypto.state", buffer, "") && |