[core] Fix crash if binder descriptor is null (#1388)
This commit is contained in:
parent
872dcf4ba8
commit
ccab9b8a1f
|
|
@ -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);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue