mirror of
https://github.com/topjohnwu/Magisk.git
synced 2026-03-16 06:48:49 -07:00
Compare commits
3 Commits
compact
...
vvb2060-pa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ddbb6c5277 | ||
|
|
8e40af96d8 | ||
|
|
d1e39c6a77 |
@@ -86,7 +86,7 @@ Before proceeding, please acknowledge that:
|
||||
|
||||
### Requirements
|
||||
|
||||
To verify whether or not Magisk can be installed in your Samsung device, you first must check the OEM Lock and KnoxGuard (RMM) status. To do so, boot your device in Download mode with its key combo.
|
||||
To verify whether or not Magisk can be installed in your Samsung device, you first must check the OEM Lock and KnoxGuard (RMM) status. To do so, go to `Settings` -> `Device Care` -> `Maintenance Mode` and enable it, then boot your device in Download mode with its key combo.
|
||||
|
||||
Possible OEM Lock values are the following:
|
||||
- **ON (L)**: fully locked.
|
||||
|
||||
@@ -27,8 +27,6 @@ struct ResetProp {
|
||||
context: bool,
|
||||
#[argh(switch, short = 'n', long = none)]
|
||||
skip_svc: bool,
|
||||
#[argh(switch, short = 'c', long = "compact")]
|
||||
compact: bool,
|
||||
#[argh(option, short = 'f')]
|
||||
file: Option<Utf8CString>,
|
||||
#[argh(option, short = 'd', long = "delete")]
|
||||
@@ -61,7 +59,6 @@ General flags:
|
||||
-h,--help show this message
|
||||
-v,--verbose print verbose output to stderr
|
||||
-w switch to wait mode
|
||||
-c,--compact compact property area
|
||||
|
||||
Read mode flags:
|
||||
-p also read persistent properties from storage
|
||||
@@ -180,11 +177,6 @@ impl ResetProp {
|
||||
ret
|
||||
}
|
||||
|
||||
fn compact(&self) -> bool {
|
||||
debug!("resetprop: compact property area");
|
||||
SYS_PROP.compact()
|
||||
}
|
||||
|
||||
fn wait(&self) {
|
||||
let key = &self.args[0];
|
||||
let val = self.args.get(1).map(|s| &**s);
|
||||
@@ -235,11 +227,7 @@ impl ResetProp {
|
||||
}
|
||||
|
||||
fn run(self) -> LoggedResult<()> {
|
||||
if self.compact {
|
||||
if !self.compact() {
|
||||
return log_err!();
|
||||
}
|
||||
} else if self.wait_mode {
|
||||
if self.wait_mode {
|
||||
self.wait();
|
||||
} else if let Some(file) = &self.file {
|
||||
self.load_file(file)?;
|
||||
@@ -281,9 +269,6 @@ pub fn resetprop_main(argc: i32, argv: *mut *mut c_char) -> i32 {
|
||||
}
|
||||
special_mode += 1;
|
||||
}
|
||||
if cli.compact {
|
||||
special_mode += 1;
|
||||
}
|
||||
if cli.file.is_some() {
|
||||
special_mode += 1;
|
||||
}
|
||||
|
||||
@@ -82,8 +82,6 @@ unsafe extern "C" {
|
||||
fn sys_prop_delete(key: CharPtr, prune: bool) -> i32;
|
||||
#[link_name = "__system_property_get_context"]
|
||||
fn sys_prop_get_context(key: CharPtr) -> CharPtr;
|
||||
#[link_name = "__system_property_compact"]
|
||||
fn sys_prop_compact() -> bool;
|
||||
#[link_name = "__system_property_area_serial2"]
|
||||
fn sys_prop_area_serial() -> u32;
|
||||
}
|
||||
@@ -177,10 +175,6 @@ impl SysProp {
|
||||
unsafe { Utf8CStr::from_ptr_unchecked(sys_prop_get_context(key.as_ptr())) }
|
||||
}
|
||||
|
||||
fn compact(&self) -> bool {
|
||||
unsafe { sys_prop_compact() }
|
||||
}
|
||||
|
||||
fn area_serial(&self) -> u32 {
|
||||
unsafe { sys_prop_area_serial() }
|
||||
}
|
||||
|
||||
2
native/src/external/system_properties
vendored
2
native/src/external/system_properties
vendored
Submodule native/src/external/system_properties updated: 2f9263d578...b7c2088565
Reference in New Issue
Block a user