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

[core] Fix broadcast on Android 12 (#1456)

This commit is contained in:
Howard Wu 2021-11-29 19:08:03 +08:00 committed by GitHub
parent cc19aa42c1
commit ed4d230821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java
View File

@ -78,7 +78,11 @@ public class ActivityManagerService {
int appOp, Bundle options, boolean serialized, boolean sticky, int userId) throws RemoteException { int appOp, Bundle options, boolean serialized, boolean sticky, int userId) throws RemoteException {
IActivityManager am = getActivityManager(); IActivityManager am = getActivityManager();
if (am == null || thread == null) return -1; if (am == null || thread == null) return -1;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { 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);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
return am.broadcastIntentWithFeature(thread, callingFeatureId, intent, resolvedType, resultTo, resultCode, resultData, map, requiredPermissions, appOp, options, serialized, sticky, userId); return am.broadcastIntentWithFeature(thread, callingFeatureId, intent, resolvedType, resultTo, resultCode, resultData, map, requiredPermissions, appOp, options, serialized, sticky, userId);
} else { } else {
return am.broadcastIntent(thread, intent, resolvedType, resultTo, resultCode, resultData, map, requiredPermissions, appOp, options, serialized, sticky, userId); return am.broadcastIntent(thread, intent, resolvedType, resultTo, resultCode, resultData, map, requiredPermissions, appOp, options, serialized, sticky, userId);

5
core/src/main/java/org/lsposed/lspd/service/ConfigManager.java
View File

@ -719,12 +719,13 @@ public class ConfigManager {
self.packageName = packageName; self.packageName = packageName;
self.userId = 0; self.userId = 0;
scopes.add(self); scopes.add(self);
int finalMid = mid;
executeInTransaction(() -> { executeInTransaction(() -> {
db.delete("scope", "mid = ?", new String[]{String.valueOf(mid)}); db.delete("scope", "mid = ?", new String[]{String.valueOf(finalMid)});
for (Application app : scopes) { for (Application app : scopes) {
if (app.packageName.equals("android") && app.userId != 0) continue; if (app.packageName.equals("android") && app.userId != 0) continue;
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put("mid", mid); values.put("mid", finalMid);
values.put("app_pkg_name", app.packageName); values.put("app_pkg_name", app.packageName);
values.put("user_id", app.userId); values.put("user_id", app.userId);
db.insertWithOnConflict("scope", null, values, SQLiteDatabase.CONFLICT_IGNORE); db.insertWithOnConflict("scope", null, values, SQLiteDatabase.CONFLICT_IGNORE);

7
hiddenapi-stubs/src/main/java/android/app/IActivityManager.java
View File

@ -33,6 +33,13 @@ import android.os.RemoteException;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
public interface IActivityManager extends IInterface { public interface IActivityManager extends IInterface {
@RequiresApi(31)
int broadcastIntentWithFeature(IApplicationThread caller, String callingFeatureId,
Intent intent, String resolvedType, IIntentReceiver resultTo,
int resultCode, String resultData, Bundle resultExtras,
String[] requiredPermissions, String[] excludedPermissions, int appOp, Bundle bOptions,
boolean serialized, boolean sticky, int userId) throws RemoteException;
@RequiresApi(30) @RequiresApi(30)
int broadcastIntentWithFeature(IApplicationThread caller, String callingFeatureId, int broadcastIntentWithFeature(IApplicationThread caller, String callingFeatureId,
Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode,