topjohnwu/libsu
1
0
Fork 0
mirror of https://github.com/topjohnwu/libsu.git synced 2024-11-23 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update handshake impl

Browse Source
This commit is contained in:
topjohnwu 2022-02-24 02:04:06 -08:00
parent 6fc9d6fa45
commit 07b34a3802
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
service/src/main/java/com/topjohnwu/superuser/internal/RootServiceManager.java
View File

@ -110,7 +110,6 @@ public class RootServiceManager implements IBinder.DeathRecipient, Handler.Callb
}
private IRootServiceManager mRM;
private IBinder mRemote;
private List<Runnable> pendingTasks;
private String filterAction;
@ -145,9 +144,6 @@ public class RootServiceManager implements IBinder.DeathRecipient, Handler.Callb
BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
// Receive new binder, treat as if the previous one died
binderDied();
Bundle bundle = intent.getBundleExtra(INTENT_EXTRA_KEY);
if (bundle == null)
return;
@ -156,9 +152,7 @@ public class RootServiceManager implements IBinder.DeathRecipient, Handler.Callb
return;
IRootServiceManager m = IRootServiceManager.Stub.asInterface(binder);
try {
binder.linkToDeath(RootServiceManager.this, 0);
m.connect(connectArgs);
mRemote = binder;
} catch (RemoteException e) {
Utils.err(TAG, e);
}
@ -327,9 +321,8 @@ public class RootServiceManager implements IBinder.DeathRecipient, Handler.Callb
@Override
public void binderDied() {
UiThreadHandler.run(() -> {
if (mRemote != null) {
mRemote.unlinkToDeath(this, 0);
mRemote = null;
if (mRM != null) {
mRM.asBinder().unlinkToDeath(this, 0);
mRM = null;
}
@ -348,7 +341,15 @@ public class RootServiceManager implements IBinder.DeathRecipient, Handler.Callb
public boolean handleMessage(@NonNull Message msg) {
switch (msg.what) {
case MSG_ACK:
mRM = IRootServiceManager.Stub.asInterface(mRemote);
IBinder b = ((Bundle) msg.obj).getBinder(BUNDLE_BINDER_KEY);
if (b == null)
return false;
try {
b.linkToDeath(this, 0);
} catch (RemoteException e) {
return false;
}
mRM = IRootServiceManager.Stub.asInterface(b);
List<Runnable> tasks = pendingTasks;
pendingTasks = null;
if (tasks != null) {

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

@ -123,6 +123,9 @@ public class RootServiceServer extends IRootServiceManager.Stub implements IBind
Message m = Message.obtain();
m.what = MSG_ACK;
bundle = new Bundle();
bundle.putBinder(BUNDLE_BINDER_KEY, this);
m.obj = bundle;
try {
c.send(m);
client = c;