Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
dbdb0a25
Commit
dbdb0a25
authored
May 18, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move late props to boot complete
parent
18a09703
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
11 deletions
+8
-11
bootstages.cpp
native/jni/core/bootstages.cpp
+1
-3
hide_policy.cpp
native/jni/magiskhide/hide_policy.cpp
+7
-8
No files found.
native/jni/core/bootstages.cpp
View file @
dbdb0a25
...
@@ -271,8 +271,8 @@ void post_fs_data(int client) {
...
@@ -271,8 +271,8 @@ void post_fs_data(int client) {
}
else
{
}
else
{
LOGI
(
"* Running post-fs-data.d scripts
\n
"
);
LOGI
(
"* Running post-fs-data.d scripts
\n
"
);
exec_common_script
(
"post-fs-data"
);
exec_common_script
(
"post-fs-data"
);
handle_modules
();
auto_start_magiskhide
();
auto_start_magiskhide
();
handle_modules
();
}
}
// We still want to do magic mount because root itself might need it
// We still want to do magic mount because root itself might need it
...
@@ -300,8 +300,6 @@ void late_start(int client) {
...
@@ -300,8 +300,6 @@ void late_start(int client) {
if
(
!
pfs_done
||
safe_mode
)
if
(
!
pfs_done
||
safe_mode
)
return
;
return
;
auto_start_magiskhide
();
LOGI
(
"* Running service.d scripts
\n
"
);
LOGI
(
"* Running service.d scripts
\n
"
);
exec_common_script
(
"service"
);
exec_common_script
(
"service"
);
...
...
native/jni/magiskhide/hide_policy.cpp
View file @
dbdb0a25
...
@@ -12,20 +12,20 @@ using namespace std;
...
@@ -12,20 +12,20 @@ using namespace std;
static
const
char
*
prop_key
[]
=
static
const
char
*
prop_key
[]
=
{
"ro.boot.vbmeta.device_state"
,
"ro.boot.verifiedbootstate"
,
"ro.boot.flash.locked"
,
{
"ro.boot.vbmeta.device_state"
,
"ro.boot.verifiedbootstate"
,
"ro.boot.flash.locked"
,
"ro.boot.veritymode"
,
"ro.boot.warranty_bit"
,
"ro.warranty_bit"
,
"ro.debuggable"
,
"ro.boot.veritymode"
,
"ro.boot.warranty_bit"
,
"ro.warranty_bit"
,
"ro.debuggable"
,
"ro.secure"
,
"ro.build.type"
,
"ro.build.tags"
,
"ro.secure"
,
"ro.build.type"
,
"ro.build.tags"
,
"vendor.boot.vbmeta.device_state"
,
"ro.vendor.boot.warranty_bit"
,
"ro.vendor.warranty_bit"
,
nullptr
};
"ro.vendor.boot.warranty_bit"
,
"ro.vendor.warranty_bit"
,
nullptr
};
static
const
char
*
prop_val
[]
=
static
const
char
*
prop_val
[]
=
{
"locked"
,
"green"
,
"1"
,
{
"locked"
,
"green"
,
"1"
,
"enforcing"
,
"0"
,
"0"
,
"0"
,
"enforcing"
,
"0"
,
"0"
,
"0"
,
"1"
,
"user"
,
"release-keys"
,
"1"
,
"user"
,
"release-keys"
,
"locked"
,
"0"
,
"0"
,
nullptr
};
"0"
,
"0"
,
nullptr
};
static
const
char
*
late_prop_key
[]
=
static
const
char
*
late_prop_key
[]
=
{
"vendor.boot.v
bmeta.device_state"
,
"vendor.boot.v
erifiedbootstate"
,
nullptr
};
{
"vendor.boot.verifiedbootstate"
,
nullptr
};
static
const
char
*
late_prop_val
[]
=
static
const
char
*
late_prop_val
[]
=
{
"
locked"
,
"
green"
,
nullptr
};
{
"green"
,
nullptr
};
void
hide_sensitive_props
()
{
void
hide_sensitive_props
()
{
LOGI
(
"hide_policy: Hiding sensitive props
\n
"
);
LOGI
(
"hide_policy: Hiding sensitive props
\n
"
);
...
@@ -43,6 +43,9 @@ void hide_sensitive_props() {
...
@@ -43,6 +43,9 @@ void hide_sensitive_props() {
bootmode
=
getprop
(
"ro.boot.mode"
);
bootmode
=
getprop
(
"ro.boot.mode"
);
if
(
!
bootmode
.
empty
()
&&
str_contains
(
bootmode
,
"recovery"
))
if
(
!
bootmode
.
empty
()
&&
str_contains
(
bootmode
,
"recovery"
))
setprop
(
"ro.boot.mode"
,
"unknown"
,
false
);
setprop
(
"ro.boot.mode"
,
"unknown"
,
false
);
bootmode
=
getprop
(
"vendor.boot.mode"
);
if
(
!
bootmode
.
empty
()
&&
str_contains
(
bootmode
,
"recovery"
))
setprop
(
"vendor.boot.mode"
,
"unknown"
,
false
);
// Xiaomi cross region flash
// Xiaomi cross region flash
auto
hwc
=
getprop
(
"ro.boot.hwc"
);
auto
hwc
=
getprop
(
"ro.boot.hwc"
);
...
@@ -65,10 +68,6 @@ void hide_late_sensitive_props() {
...
@@ -65,10 +68,6 @@ void hide_late_sensitive_props() {
if
(
!
value
.
empty
()
&&
value
!=
late_prop_val
[
i
])
if
(
!
value
.
empty
()
&&
value
!=
late_prop_val
[
i
])
setprop
(
prop_key
[
i
],
late_prop_val
[
i
],
false
);
setprop
(
prop_key
[
i
],
late_prop_val
[
i
],
false
);
}
}
auto
bootmode
=
getprop
(
"vendor.boot.mode"
);
if
(
!
bootmode
.
empty
()
&&
str_contains
(
bootmode
,
"recovery"
))
setprop
(
"vendor.boot.mode"
,
"unknown"
,
false
);
}
}
static
void
lazy_unmount
(
const
char
*
mountpoint
)
{
static
void
lazy_unmount
(
const
char
*
mountpoint
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment