TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-03 03:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to ONDK r25.7

Browse Source
This commit is contained in:
topjohnwu 2023-08-15 17:10:20 -07:00
parent f86c66c99d
commit 41226c12b8
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -28,4 +28,4 @@ android.nonFinalResIds=false
# Magisk # Magisk
magisk.stubVersion=37 magisk.stubVersion=37
magisk.versionCode=26105 magisk.versionCode=26105
magisk.ondkVersion=r25.6 magisk.ondkVersion=r25.7

2
native/src/boot/bootimg.cpp
View File

@ -116,7 +116,7 @@ void dyn_img_hdr::dump_hdr_file() const {
} }
void dyn_img_hdr::load_hdr_file() { void dyn_img_hdr::load_hdr_file() {
parse_prop_file(HEADER_FILE, [=](string_view key, string_view value) -> bool { parse_prop_file(HEADER_FILE, [=, this](string_view key, string_view value) -> bool {
if (key == "name" && name()) { if (key == "name" && name()) {
memset(name(), 0, 16); memset(name(), 0, 16);
memcpy(name(), value.data(), value.length() > 15 ? 15 : value.length()); memcpy(name(), value.data(), value.length() > 15 ? 15 : value.length());

2
native/src/boot/lib.rs
View File

@ -1,5 +1,5 @@
#![feature(format_args_nl)] #![feature(format_args_nl)]
#![feature(btree_drain_filter)] #![feature(btree_extract_if)]
pub use base; pub use base;
use cpio::cpio_commands; use cpio::cpio_commands;

2
native/src/boot/ramdisk.rs
View File

@ -93,7 +93,7 @@ impl MagiskCpio for Cpio {
let mut backups = HashMap::<String, Box<CpioEntry>>::new(); let mut backups = HashMap::<String, Box<CpioEntry>>::new();
let mut rm_list = String::new(); let mut rm_list = String::new();
self.entries self.entries
.drain_filter(|name, _| name.starts_with(".backup/")) .extract_if(|name, _| name.starts_with(".backup/"))
.for_each(|(name, entry)| { .for_each(|(name, entry)| {
if name == ".backup/.rmlist" { if name == ".backup/.rmlist" {
if let Ok(data) = from_utf8(&entry.data) { if let Ok(data) = from_utf8(&entry.data) {

2
native/src/sepolicy/sepolicy.cpp
View File

@ -694,7 +694,7 @@ bool sepol_impl::add_typeattribute(const char *type, const char *attr) {
} }
void sepol_impl::strip_dontaudit() { void sepol_impl::strip_dontaudit() {
avtab_for_each(&db->te_avtab, [=](avtab_ptr_t node) { avtab_for_each(&db->te_avtab, [=, this](avtab_ptr_t node) {
if (node->key.specified == AVTAB_AUDITDENY || node->key.specified == AVTAB_XPERMS_DONTAUDIT) if (node->key.specified == AVTAB_AUDITDENY || node->key.specified == AVTAB_XPERMS_DONTAUDIT)
avtab_remove_node(&db->te_avtab, node); avtab_remove_node(&db->te_avtab, node);
}); });