WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core] Handler when system server dies

This commit is contained in:
LoveSy 2021-02-21 20:36:15 +08:00 committed by tehcneko
parent 43e878aabe
commit 535dd32e52
4 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/io/github/lsposed/lspd/service/ActivityManagerService.java
View File

@ -27,6 +27,9 @@ import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.Log;
import static io.github.lsposed.lspd.service.ServiceManager.TAG;
public class ActivityManagerService { public class ActivityManagerService {
private static IActivityManager am = null; private static IActivityManager am = null;
@ -35,6 +38,20 @@ public class ActivityManagerService {
public static IActivityManager getActivityManager() { public static IActivityManager getActivityManager() {
if (binder == null && am == null) { if (binder == null && am == null) {
binder = ServiceManager.getService("activity"); binder = ServiceManager.getService("activity");
if (binder == null) return null;
try {
binder.linkToDeath(new IBinder.DeathRecipient() {
@Override
public void binderDied() {
Log.w(TAG, "am is dead");
binder.unlinkToDeath(this, 0);
binder = null;
am = null;
}
}, 0);
} catch (RemoteException e) {
Log.e(TAG, Log.getStackTraceString(e));
}
am = IActivityManager.Stub.asInterface(binder); am = IActivityManager.Stub.asInterface(binder);
} }
return am; return am;

3
core/src/main/java/io/github/lsposed/lspd/service/BridgeService.java
View File

@ -97,6 +97,7 @@ public class BridgeService {
} }
bridgeService.unlinkToDeath(this, 0); bridgeService.unlinkToDeath(this, 0);
listener.onSystemServerDied();
sendToBridge(serviceBinder, true); sendToBridge(serviceBinder, true);
} }
} }
@ -113,6 +114,8 @@ public class BridgeService {
void onSystemServerRestarted(); void onSystemServerRestarted();
void onResponseFromBridgeService(boolean response); void onResponseFromBridgeService(boolean response);
void onSystemServerDied();
} }
private static Listener listener; private static Listener listener;

12
core/src/main/java/io/github/lsposed/lspd/service/ServiceManager.java
View File

@ -42,6 +42,10 @@ public class ServiceManager {
} }
} }
private static void putBinderForSystemServer() {
android.os.ServiceManager.addService("serial", (IBinder) mainService);
}
// call by ourselves // call by ourselves
public static void start() { public static void start() {
Log.i(TAG, "starting server..."); Log.i(TAG, "starting server...");
@ -56,7 +60,7 @@ public class ServiceManager {
applicationService = new LSPApplicationService(); applicationService = new LSPApplicationService();
managerService = new LSPManagerService(); managerService = new LSPManagerService();
android.os.ServiceManager.addService("serial", (IBinder) mainService); putBinderForSystemServer();
waitSystemService("package"); waitSystemService("package");
waitSystemService("activity"); waitSystemService("activity");
@ -77,6 +81,12 @@ public class ServiceManager {
Log.w(TAG, "no response from bridge"); Log.w(TAG, "no response from bridge");
} }
} }
@Override
public void onSystemServerDied() {
Log.w(TAG, "system server died");
putBinderForSystemServer();
}
}); });
try { try {

17
core/src/main/java/io/github/lsposed/lspd/service/UserService.java
View File

@ -25,9 +25,12 @@ import android.os.IBinder;
import android.os.IUserManager; import android.os.IUserManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.Log;
import java.util.List; import java.util.List;
import static io.github.lsposed.lspd.service.ServiceManager.TAG;
public class UserService { public class UserService {
private static IUserManager um = null; private static IUserManager um = null;
private static IBinder binder = null; private static IBinder binder = null;
@ -35,6 +38,20 @@ public class UserService {
public static IUserManager getUserManager() { public static IUserManager getUserManager() {
if (binder == null && um == null) { if (binder == null && um == null) {
binder = ServiceManager.getService("user"); binder = ServiceManager.getService("user");
if (binder == null) return null;
try {
binder.linkToDeath(new IBinder.DeathRecipient() {
@Override
public void binderDied() {
Log.w(TAG, "um is dead");
binder.unlinkToDeath(this, 0);
binder = null;
um = null;
}
}, 0);
} catch (RemoteException e) {
Log.e(TAG, Log.getStackTraceString(e));
}
um = IUserManager.Stub.asInterface(binder); um = IUserManager.Stub.asInterface(binder);
} }
return um; return um;