From 76c9188fae3b954faf17f4bc1777fd02fd3479ff Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 11 Mar 2018 02:53:57 +0800 Subject: [PATCH] Android P renamed nonplat_properties --- native/jni/resetprop/system_properties.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/native/jni/resetprop/system_properties.cpp b/native/jni/resetprop/system_properties.cpp index c439c48a3..3b5f53529 100644 --- a/native/jni/resetprop/system_properties.cpp +++ b/native/jni/resetprop/system_properties.cpp @@ -1116,7 +1116,8 @@ static bool initialize_properties() { if (!initialize_properties_from_file("/system/etc/selinux/plat_property_contexts")) { return false; } - if (!initialize_properties_from_file("/vendor/etc/selinux/nonplat_property_contexts")) { + if (!initialize_properties_from_file("/vendor/etc/selinux/nonplat_property_contexts") + && !initialize_properties_from_file("/vendor/etc/selinux/vendor_property_contexts")) { return false; } } else {