summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2017-06-15 00:30:39 +0200
committerJeffrey Vander Stoep <jeffv@google.com>2017-06-15 23:24:29 +0200
commite35926e1aff2e6b9b54656bd59c8178e295a1b7e (patch)
tree22147f867876adb8d6fa57daafffdb3eb82ff8d6
parentFix the input parameter for "set_retry_bootloader_message" (diff)
downloadandroid_bootable_recovery-e35926e1aff2e6b9b54656bd59c8178e295a1b7e.tar
android_bootable_recovery-e35926e1aff2e6b9b54656bd59c8178e295a1b7e.tar.gz
android_bootable_recovery-e35926e1aff2e6b9b54656bd59c8178e295a1b7e.tar.bz2
android_bootable_recovery-e35926e1aff2e6b9b54656bd59c8178e295a1b7e.tar.lz
android_bootable_recovery-e35926e1aff2e6b9b54656bd59c8178e295a1b7e.tar.xz
android_bootable_recovery-e35926e1aff2e6b9b54656bd59c8178e295a1b7e.tar.zst
android_bootable_recovery-e35926e1aff2e6b9b54656bd59c8178e295a1b7e.zip
-rw-r--r--recovery.cpp9
-rw-r--r--updater/updater.cpp6
2 files changed, 6 insertions, 9 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 30edaa57b..c1a31b6a8 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -54,6 +54,7 @@
#include <healthd/BatteryMonitor.h>
#include <private/android_logger.h> /* private pmsg functions */
#include <private/android_filesystem_config.h> /* for AID_SYSTEM */
+#include <selinux/android.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
#include <ziparchive/zip_archive.h>
@@ -1481,12 +1482,8 @@ int main(int argc, char **argv) {
ui->SetBackground(RecoveryUI::NONE);
if (show_text) ui->ShowText(true);
- struct selinux_opt seopts[] = {
- { SELABEL_OPT_PATH, "/file_contexts" }
- };
-
- sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);
-
+ sehandle = selinux_android_file_context_handle();
+ selinux_android_set_sehandle(sehandle);
if (!sehandle) {
ui->Print("Warning: No file_contexts\n");
}
diff --git a/updater/updater.cpp b/updater/updater.cpp
index c09e267a5..f3e282044 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -25,6 +25,7 @@
#include <android-base/logging.h>
#include <android-base/strings.h>
+#include <selinux/android.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
#include <ziparchive/zip_archive.h>
@@ -139,9 +140,8 @@ int main(int argc, char** argv) {
return 6;
}
- struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "/file_contexts" } };
-
- sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);
+ sehandle = selinux_android_file_context_handle();
+ selinux_android_set_sehandle(sehandle);
if (!sehandle) {
fprintf(cmd_pipe, "ui_print Warning: No file_contexts\n");