summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/private/android_filesystem_config.h1
-rw-r--r--init/property_service.c1
-rw-r--r--rootdir/init.rc5
3 files changed, 7 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 53619ac16..e3568ae04 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -247,6 +247,7 @@ static const struct fs_path_config android_files[] = {
/* the following files have enhanced capabilities and ARE included in user builds. */
{ 00750, AID_ROOT, AID_SHELL, (1 << CAP_SETUID) | (1 << CAP_SETGID), "system/bin/run-as" },
+ { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" },
{ 00755, AID_ROOT, AID_ROOT, 0, "system/lib/valgrind/*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" },
diff --git a/init/property_service.c b/init/property_service.c
index 1b9327ce3..6cdb9574e 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -110,6 +110,7 @@ struct {
} control_perms[] = {
{ "dumpstate",AID_SHELL, AID_LOG },
{ "ril-daemon",AID_RADIO, AID_RADIO },
+ { "pre-recovery", AID_SYSTEM, AID_SYSTEM },
{NULL, 0, 0 }
};
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 7ee1be901..324ac373b 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -577,3 +577,8 @@ service mdnsd /system/bin/mdnsd
socket mdnsd stream 0660 mdnsr inet
disabled
oneshot
+
+service pre-recovery /system/bin/uncrypt
+ class main
+ disabled
+ oneshot