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

Fix: "cancelNotificationWithTag" method difference when API below 30 (#1975)

This commit is contained in:
Fankesyooni 2022-06-06 16:28:07 +08:00 committed by GitHub
parent 9d3f9cfdc7
commit c10d4dd837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/src/main/java/org/lsposed/lspd/service/LSPManagerService.java
View File

@ -309,7 +309,11 @@ public class LSPManagerService extends ILSPManagerService.Stub {
var idValue = notificationIds.get(idKey); var idValue = notificationIds.get(idKey);
if (idValue == null) return; if (idValue == null) return;
var im = INotificationManager.Stub.asInterface(android.os.ServiceManager.getService("notification")); var im = INotificationManager.Stub.asInterface(android.os.ServiceManager.getService("notification"));
im.cancelNotificationWithTag("android", "android", modulePackageName, idValue, 0); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
im.cancelNotificationWithTag("android", "android", modulePackageName, idValue, 0);
} else {
im.cancelNotificationWithTag("android", modulePackageName, idValue, 0);
}
// Remove the notification id when the notification is canceled or current module app was uninstalled // Remove the notification id when the notification is canceled or current module app was uninstalled
notificationIds.remove(idKey); notificationIds.remove(idKey);
} catch (Throwable e) { } catch (Throwable e) {

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

@ -6,10 +6,17 @@ import android.os.IBinder;
import android.os.IInterface; import android.os.IInterface;
import android.os.RemoteException; import android.os.RemoteException;
import androidx.annotation.RequiresApi;
public interface INotificationManager extends IInterface { public interface INotificationManager extends IInterface {
void enqueueNotificationWithTag(String pkg, String opPkg, String tag, int id, void enqueueNotificationWithTag(String pkg, String opPkg, String tag, int id,
Notification notification, int userId) throws RemoteException; Notification notification, int userId) throws RemoteException;
void cancelNotificationWithTag(String pkg, String tag, int id, int userId) throws RemoteException;
@RequiresApi(30)
void cancelNotificationWithTag(String pkg, String opPkg, String tag, int id, int userId) throws RemoteException; void cancelNotificationWithTag(String pkg, String opPkg, String tag, int id, int userId) throws RemoteException;
void createNotificationChannels(String pkg, ParceledListSlice<NotificationChannel> channelsList) throws RemoteException; void createNotificationChannels(String pkg, ParceledListSlice<NotificationChannel> channelsList) throws RemoteException;
abstract class Stub extends Binder implements INotificationManager { abstract class Stub extends Binder implements INotificationManager {