summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-03-23 18:01:11 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-03-23 18:01:11 +0100
commitf5ac45cbd98bab47b281269253aa5fb19c5c53d7 (patch)
treeea3b4bfabf8b2eae4f741bb68fb39e77e90badeb
parentMerge "Remove malloc in edify functions" am: 1ea869b0c6 (diff)
parentMerge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." (diff)
downloadandroid_bootable_recovery-f5ac45cbd98bab47b281269253aa5fb19c5c53d7.tar
android_bootable_recovery-f5ac45cbd98bab47b281269253aa5fb19c5c53d7.tar.gz
android_bootable_recovery-f5ac45cbd98bab47b281269253aa5fb19c5c53d7.tar.bz2
android_bootable_recovery-f5ac45cbd98bab47b281269253aa5fb19c5c53d7.tar.lz
android_bootable_recovery-f5ac45cbd98bab47b281269253aa5fb19c5c53d7.tar.xz
android_bootable_recovery-f5ac45cbd98bab47b281269253aa5fb19c5c53d7.tar.zst
android_bootable_recovery-f5ac45cbd98bab47b281269253aa5fb19c5c53d7.zip
-rw-r--r--recovery.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 91c511a6a..ccb8e5d95 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -53,6 +53,7 @@
#include <cutils/properties.h> /* for property_list */
#include <healthd/BatteryMonitor.h>
#include <private/android_logger.h> /* private pmsg functions */
+#include <private/android_filesystem_config.h> /* for AID_SYSTEM */
#include <selinux/label.h>
#include <selinux/selinux.h>
#include <ziparchive/zip_archive.h>
@@ -460,9 +461,9 @@ static void copy_logs() {
copy_log_file(TEMPORARY_INSTALL_FILE, LAST_INSTALL_FILE, false);
save_kernel_log(LAST_KMSG_FILE);
chmod(LOG_FILE, 0600);
- chown(LOG_FILE, 1000, 1000); // system user
+ chown(LOG_FILE, AID_SYSTEM, AID_SYSTEM);
chmod(LAST_KMSG_FILE, 0600);
- chown(LAST_KMSG_FILE, 1000, 1000); // system user
+ chown(LAST_KMSG_FILE, AID_SYSTEM, AID_SYSTEM);
chmod(LAST_LOG_FILE, 0640);
chmod(LAST_INSTALL_FILE, 0644);
sync();