[core] Fix crash if binder descriptor is null (#1388)

This commit is contained in:
LoveSy 2021-11-11 17:26:23 +08:00 committed by GitHub
parent 872dcf4ba8
commit ccab9b8a1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -295,8 +295,8 @@ public class BridgeService {
try { try {
String descriptor = obj.getInterfaceDescriptor(); String descriptor = obj.getInterfaceDescriptor();
if (descriptor == null || (!descriptor.equals("android.app.IActivityManager") && if (!"android.app.IActivityManager".equals(descriptor) &&
!descriptor.equals("com.sonymobile.hookservice.HookActivityService"))) { !"com.sonymobile.hookservice.HookActivityService".equals(descriptor)) {
return false; return false;
} }
return ActivityController.replaceShellCommand(obj, data, reply); return ActivityController.replaceShellCommand(obj, data, reply);
@ -320,8 +320,8 @@ public class BridgeService {
try { try {
String descriptor = ParcelUtils.readInterfaceDescriptor(data); String descriptor = ParcelUtils.readInterfaceDescriptor(data);
if (!descriptor.equals("android.app.IActivityManager") && if (!"android.app.IActivityManager".equals(descriptor) &&
!descriptor.equals("com.sonymobile.hookservice.HookActivityService")) { !"com.sonymobile.hookservice.HookActivityService".equals(descriptor)) {
return false; return false;
} }
return ActivityController.replaceActivityController(data); return ActivityController.replaceActivityController(data);