system/core
| Revisión | 0712a4737b57d0a1ba8bed727e6d76eac9df1c4f (tree) |
|---|---|
| Tiempo | 2020-05-20 23:05:35 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86
init/Android.mk (diff)
init/init.cpp (diff)| @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) | ||
| 7 | 7 | ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) |
| 8 | 8 | init_options += -DALLOW_LOCAL_PROP_OVERRIDE=1 -DALLOW_PERMISSIVE_SELINUX=1 |
| 9 | 9 | else |
| 10 | -init_options += -DALLOW_LOCAL_PROP_OVERRIDE=0 -DALLOW_PERMISSIVE_SELINUX=0 | |
| 10 | +init_options += -DALLOW_LOCAL_PROP_OVERRIDE=0 -DALLOW_PERMISSIVE_SELINUX=1 | |
| 11 | 11 | endif |
| 12 | 12 | |
| 13 | 13 | init_options += -DLOG_UEVENTS=0 |
| @@ -443,11 +443,11 @@ static void selinux_init_all_handles(void) | ||
| 443 | 443 | enum selinux_enforcing_status { SELINUX_PERMISSIVE, SELINUX_ENFORCING }; |
| 444 | 444 | |
| 445 | 445 | static selinux_enforcing_status selinux_status_from_cmdline() { |
| 446 | - selinux_enforcing_status status = SELINUX_ENFORCING; | |
| 446 | + selinux_enforcing_status status = SELINUX_PERMISSIVE; | |
| 447 | 447 | |
| 448 | 448 | import_kernel_cmdline(false, [&](const std::string& key, const std::string& value, bool in_qemu) { |
| 449 | - if (key == "androidboot.selinux" && value == "permissive") { | |
| 450 | - status = SELINUX_PERMISSIVE; | |
| 449 | + if (key == "androidboot.selinux" && value == "enforcing") { | |
| 450 | + status = SELINUX_ENFORCING; | |
| 451 | 451 | } |
| 452 | 452 | }); |
| 453 | 453 |
Fork