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
817cdf71
Commit
817cdf71
authored
Jan 28, 2019
by
vvb2060
Committed by
John Wu
Nov 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix multiuser owner_managed mode
parent
1a38f25b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
MagiskPolicy.kt
...in/java/com/topjohnwu/magisk/model/entity/MagiskPolicy.kt
+3
-3
connect.cpp
native/jni/su/connect.cpp
+2
-6
No files found.
app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskPolicy.kt
View file @
817cdf71
...
@@ -38,7 +38,7 @@ fun MagiskPolicy.toMap() = mapOf(
...
@@ -38,7 +38,7 @@ fun MagiskPolicy.toMap() = mapOf(
fun
Map
<
String
,
String
>.
toPolicy
(
pm
:
PackageManager
):
MagiskPolicy
{
fun
Map
<
String
,
String
>.
toPolicy
(
pm
:
PackageManager
):
MagiskPolicy
{
val
uid
=
get
(
"uid"
)
?.
toIntOrNull
()
?:
-
1
val
uid
=
get
(
"uid"
)
?.
toIntOrNull
()
?:
-
1
val
packageName
=
get
(
"package_name"
).
orEmpty
()
val
packageName
=
get
(
"package_name"
).
orEmpty
()
val
info
=
pm
.
getApplicationInfo
(
packageName
,
0
)
val
info
=
pm
.
getApplicationInfo
(
packageName
,
PackageManager
.
GET_UNINSTALLED_PACKAGES
)
if
(
info
.
uid
!=
uid
)
if
(
info
.
uid
!=
uid
)
throw
PackageManager
.
NameNotFoundException
()
throw
PackageManager
.
NameNotFoundException
()
...
@@ -59,9 +59,9 @@ fun Map<String, String>.toPolicy(pm: PackageManager): MagiskPolicy {
...
@@ -59,9 +59,9 @@ fun Map<String, String>.toPolicy(pm: PackageManager): MagiskPolicy {
fun
Int
.
toPolicy
(
pm
:
PackageManager
,
policy
:
Int
=
INTERACTIVE
):
MagiskPolicy
{
fun
Int
.
toPolicy
(
pm
:
PackageManager
,
policy
:
Int
=
INTERACTIVE
):
MagiskPolicy
{
val
pkg
=
pm
.
getPackagesForUid
(
this
)
?.
firstOrNull
()
val
pkg
=
pm
.
getPackagesForUid
(
this
)
?.
firstOrNull
()
?:
throw
PackageManager
.
NameNotFoundException
()
?:
throw
PackageManager
.
NameNotFoundException
()
val
info
=
pm
.
getApplicationInfo
(
pkg
,
0
)
val
info
=
pm
.
getApplicationInfo
(
pkg
,
PackageManager
.
GET_UNINSTALLED_PACKAGES
)
return
MagiskPolicy
(
return
MagiskPolicy
(
uid
=
this
,
uid
=
info
.
uid
,
packageName
=
pkg
,
packageName
=
pkg
,
policy
=
policy
,
policy
=
policy
,
applicationInfo
=
info
,
applicationInfo
=
info
,
...
...
native/jni/su/connect.cpp
View file @
817cdf71
...
@@ -34,10 +34,6 @@ enum {
...
@@ -34,10 +34,6 @@ enum {
(info->cfg[SU_MULTIUSER_MODE] == MULTIUSER_MODE_USER \
(info->cfg[SU_MULTIUSER_MODE] == MULTIUSER_MODE_USER \
? info->uid / 100000 : 0)
? info->uid / 100000 : 0)
#define get_uid(info) \
(info->cfg[SU_MULTIUSER_MODE] == MULTIUSER_MODE_OWNER_MANAGED \
? info->uid % 100000 : info->uid)
#define get_cmd(to) \
#define get_cmd(to) \
(to.command[0] ? to.command : to.shell[0] ? to.shell : DEFAULT_SHELL)
(to.command[0] ? to.command : to.shell[0] ? to.shell : DEFAULT_SHELL)
...
@@ -165,7 +161,7 @@ void app_log(const su_context &ctx) {
...
@@ -165,7 +161,7 @@ void app_log(const su_context &ctx) {
if
(
fork_dont_care
()
==
0
)
{
if
(
fork_dont_care
()
==
0
)
{
vector
<
Extra
>
extras
;
vector
<
Extra
>
extras
;
extras
.
reserve
(
6
);
extras
.
reserve
(
6
);
extras
.
emplace_back
(
"from.uid"
,
get_uid
(
ctx
.
info
)
);
extras
.
emplace_back
(
"from.uid"
,
ctx
.
info
->
uid
);
extras
.
emplace_back
(
"to.uid"
,
ctx
.
req
.
uid
);
extras
.
emplace_back
(
"to.uid"
,
ctx
.
req
.
uid
);
extras
.
emplace_back
(
"pid"
,
ctx
.
pid
);
extras
.
emplace_back
(
"pid"
,
ctx
.
pid
);
extras
.
emplace_back
(
"policy"
,
ctx
.
info
->
access
.
policy
);
extras
.
emplace_back
(
"policy"
,
ctx
.
info
->
access
.
policy
);
...
@@ -181,7 +177,7 @@ void app_notify(const su_context &ctx) {
...
@@ -181,7 +177,7 @@ void app_notify(const su_context &ctx) {
if
(
fork_dont_care
()
==
0
)
{
if
(
fork_dont_care
()
==
0
)
{
vector
<
Extra
>
extras
;
vector
<
Extra
>
extras
;
extras
.
reserve
(
2
);
extras
.
reserve
(
2
);
extras
.
emplace_back
(
"from.uid"
,
get_uid
(
ctx
.
info
)
);
extras
.
emplace_back
(
"from.uid"
,
ctx
.
info
->
uid
);
extras
.
emplace_back
(
"policy"
,
ctx
.
info
->
access
.
policy
);
extras
.
emplace_back
(
"policy"
,
ctx
.
info
->
access
.
policy
);
exec_cmd
(
"notify"
,
extras
,
ctx
.
info
);
exec_cmd
(
"notify"
,
extras
,
ctx
.
info
);
...
...
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