From 8f8eb73a69036cfbdd560ce61c183a550b338b08 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Wed, 14 Sep 2022 10:52:52 +0800 Subject: [PATCH] Fix broadcastIntentWithFeature on Android S with newer patch (#2111) --- .../java/org/lsposed/lspd/service/ActivityManagerService.java | 4 +--- .../stubs/src/main/java/android/app/IActivityManager.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/daemon/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java b/daemon/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java index cfdac76b..d82d284b 100644 --- a/daemon/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java +++ b/daemon/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java @@ -79,15 +79,13 @@ public class ActivityManagerService { int appOp, Bundle options, boolean serialized, boolean sticky, int userId) throws RemoteException { IActivityManager am = getActivityManager(); if (am == null || thread == null) return -1; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { try { return am.broadcastIntentWithFeature(thread, callingFeatureId, intent, resolvedType, resultTo, resultCode, resultData, null, requiredPermissions, null, null, appOp, null, serialized, sticky, userId); } catch (NoSuchMethodError ignored) { } - } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { return am.broadcastIntentWithFeature(thread, callingFeatureId, intent, resolvedType, resultTo, resultCode, resultData, null, requiredPermissions, null, appOp, null, serialized, sticky, userId); diff --git a/hiddenapi/stubs/src/main/java/android/app/IActivityManager.java b/hiddenapi/stubs/src/main/java/android/app/IActivityManager.java index 32bacaea..a9cc7524 100644 --- a/hiddenapi/stubs/src/main/java/android/app/IActivityManager.java +++ b/hiddenapi/stubs/src/main/java/android/app/IActivityManager.java @@ -33,7 +33,7 @@ import android.os.RemoteException; import androidx.annotation.RequiresApi; public interface IActivityManager extends IInterface { - @RequiresApi(32) + @RequiresApi(31) int broadcastIntentWithFeature(IApplicationThread caller, String callingFeatureId, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras,