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
89e0be00
Commit
89e0be00
authored
Nov 13, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a bug causing magiskhide CLI freezing
parent
ef40c121
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
bootstages.cpp
native/jni/daemon/bootstages.cpp
+1
-1
magiskhide.cpp
native/jni/magiskhide/magiskhide.cpp
+6
-3
magiskhide.h
native/jni/magiskhide/magiskhide.h
+1
-1
proc_monitor.cpp
native/jni/magiskhide/proc_monitor.cpp
+1
-0
No files found.
native/jni/daemon/bootstages.cpp
View file @
89e0be00
...
...
@@ -576,7 +576,7 @@ static bool check_data() {
return
data
;
}
extern
int
launch_magiskhide
();
extern
int
launch_magiskhide
(
int
client
=
-
1
);
static
void
*
start_magisk_hide
(
void
*
)
{
launch_magiskhide
();
...
...
native/jni/magiskhide/magiskhide.cpp
View file @
89e0be00
...
...
@@ -32,7 +32,7 @@ pthread_mutex_t list_lock;
exit
(
1
);
}
int
launch_magiskhide
()
{
int
launch_magiskhide
(
int
client
)
{
if
(
hide_enabled
)
return
HIDE_IS_ENABLED
;
...
...
@@ -62,9 +62,12 @@ int launch_magiskhide() {
// Get thread reference
proc_monitor_thread
=
pthread_self
();
if
(
client
>=
0
)
{
write_int
(
client
,
DAEMON_SUCCESS
);
close
(
client
);
}
// Start monitoring
proc_monitor
();
return
DAEMON_SUCCESS
;
error
:
hide_enabled
=
0
;
...
...
@@ -101,7 +104,7 @@ void magiskhide_handler(int client) {
switch
(
req
)
{
case
LAUNCH_MAGISKHIDE
:
res
=
launch_magiskhide
();
res
=
launch_magiskhide
(
client
);
break
;
case
STOP_MAGISKHIDE
:
res
=
stop_magiskhide
();
...
...
native/jni/magiskhide/magiskhide.h
View file @
89e0be00
...
...
@@ -10,7 +10,7 @@
#define TERM_THREAD SIGUSR1
// Daemon entries
int
launch_magiskhide
();
int
launch_magiskhide
(
int
client
);
int
stop_magiskhide
();
int
add_list
(
int
client
);
int
rm_list
(
int
client
);
...
...
native/jni/magiskhide/proc_monitor.cpp
View file @
89e0be00
...
...
@@ -200,4 +200,5 @@ void proc_monitor() {
if
(
fork_dont_care
()
==
0
)
hide_daemon
(
pid
);
}
pthread_exit
(
nullptr
);
}
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