OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb829a4
)
Special-case for credential encrypted system dir.
author
Jeff Sharkey
<jsharkey@android.com>
Wed, 11 Nov 2015 18:33:59 +0000
(10:33 -0800)
committer
Jeff Sharkey
<jsharkey@android.com>
Wed, 11 Nov 2015 18:43:09 +0000
(10:43 -0800)
Bug:
22358539
Change-Id: I85a3b9df6047fb716ba4f82583d53687c51bf590
ext4_utils/ext4_crypt_init_extensions.cpp
patch
|
blob
|
history
diff --git
a/ext4_utils/ext4_crypt_init_extensions.cpp
b/ext4_utils/ext4_crypt_init_extensions.cpp
index
64ec330
..
50f4683
100644
(file)
--- a/
ext4_utils/ext4_crypt_init_extensions.cpp
+++ b/
ext4_utils/ext4_crypt_init_extensions.cpp
@@
-153,6
+153,9
@@
int e4crypt_set_directory_policy(const char* dir)
if (!strcmp(dir, "/data/user")) {
return 0;
}
+ if (!strcmp(dir, "/data/system_ce")) {
+ return 0;
+ }
UnencryptedProperties props("/data");
std::string policy = props.Get<std::string>(properties::ref);