topjohnwu/libsu
1
0
Fork 0
mirror of https://github.com/topjohnwu/libsu.git synced 2024-10-07 01:03:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Call getCallingUid on the correct thread

Browse Source
This commit is contained in:
topjohnwu 2022-03-09 23:55:52 -08:00
parent 168d96b069
commit 36833c97a6
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
service/src/main/java/com/topjohnwu/superuser/internal/RootServiceServer.java
View File

@ -97,16 +97,17 @@ public class RootServiceServer extends IRootServiceManager.Stub {
@Override
public void connect(IBinder binder, boolean debug) {
UiThreadHandler.run(() -> connectInternal(binder, debug));
int uid = getCallingUid();
UiThreadHandler.run(() -> connectInternal(uid, binder, debug));
}
private void connectInternal(IBinder binder, boolean debug) {
ClientProcess c = clients.get(getCallingUid());
private void connectInternal(int uid, IBinder binder, boolean debug) {
ClientProcess c = clients.get(uid);
if (c != null)
return;
try {
c = new ClientProcess(binder);
c = new ClientProcess(binder, uid);
} catch (RemoteException e) {
Utils.err(TAG, e);
return;
@ -133,7 +134,7 @@ public class RootServiceServer extends IRootServiceManager.Stub {
m.setData(bundle);
try {
c.m.send(m);
clients.put(c.uid, c);
clients.put(c.mUid, c);
} catch (RemoteException e) {
Utils.err(TAG, e);
} finally {
@ -322,19 +323,19 @@ public class RootServiceServer extends IRootServiceManager.Stub {
class ClientProcess extends BinderHolder {
final Messenger m;
final int uid;
final int mUid;
ClientProcess(IBinder b) throws RemoteException {
ClientProcess(IBinder b, int uid) throws RemoteException {
super(b);
m = new Messenger(b);
uid = getCallingUid();
mUid = uid;
}
@Override
protected void onBinderDied() {
Utils.log(TAG, "Client process terminated, uid=" + uid);
clients.remove(uid);
unbindServices(uid);
Utils.log(TAG, "Client process terminated, uid=" + mUid);
clients.remove(mUid);
unbindServices(mUid);
}
}