summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2017-06-16 05:01:28 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-06-16 05:01:28 +0200
commitce3f4dc513190dcda8fe6a497eefeb795fac5f11 (patch)
tree5032a605a8777203352c7f0d3e1b2190ec58a62a
parentMerge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 (diff)
parentFix "No file_contexts" warning (diff)
downloadandroid_bootable_recovery-ce3f4dc513190dcda8fe6a497eefeb795fac5f11.tar
android_bootable_recovery-ce3f4dc513190dcda8fe6a497eefeb795fac5f11.tar.gz
android_bootable_recovery-ce3f4dc513190dcda8fe6a497eefeb795fac5f11.tar.bz2
android_bootable_recovery-ce3f4dc513190dcda8fe6a497eefeb795fac5f11.tar.lz
android_bootable_recovery-ce3f4dc513190dcda8fe6a497eefeb795fac5f11.tar.xz
android_bootable_recovery-ce3f4dc513190dcda8fe6a497eefeb795fac5f11.tar.zst
android_bootable_recovery-ce3f4dc513190dcda8fe6a497eefeb795fac5f11.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 122b89d0b..852f1e862 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -53,6 +53,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 f5ff6df91..1d8fa8e92 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");