From a76236bc13ddcb3e6699b49e462ac328d3a0b415 Mon Sep 17 00:00:00 2001 From: tornaco Date: Fri, 10 Jun 2022 21:20:59 +0800 Subject: [PATCH] [service] bring up android T (33) --- .../java/github/tornaco/xposed/annotation/XposedHook.java | 4 +++- android/internal/Thanox-Internal | 2 +- .../delegate/hooks/ActivityIntentResolverRegistry.java | 3 ++- .../plugin/push/message/delegate/hooks/DelegateRegistry.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/android/annotation_processors/xposed_hook_annotation/src/main/java/github/tornaco/xposed/annotation/XposedHook.java b/android/annotation_processors/xposed_hook_annotation/src/main/java/github/tornaco/xposed/annotation/XposedHook.java index b4fbb611f..9565ad825 100644 --- a/android/annotation_processors/xposed_hook_annotation/src/main/java/github/tornaco/xposed/annotation/XposedHook.java +++ b/android/annotation_processors/xposed_hook_annotation/src/main/java/github/tornaco/xposed/annotation/XposedHook.java @@ -29,7 +29,9 @@ interface SdkVersions { int _30 = 30; int _31 = 31; int _32 = 32; + // Android T + int _33 = 33; - int[] ALL = {_21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32}; + int[] ALL = {_21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33}; } } diff --git a/android/internal/Thanox-Internal b/android/internal/Thanox-Internal index c6c8e7c10..1f2758b49 160000 --- a/android/internal/Thanox-Internal +++ b/android/internal/Thanox-Internal @@ -1 +1 @@ -Subproject commit c6c8e7c10c2828ceeab4bbe7b7aea938725e25b4 +Subproject commit 1f2758b497690efde8a584908caf6633d0687ceb diff --git a/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/ActivityIntentResolverRegistry.java b/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/ActivityIntentResolverRegistry.java index 2b4addd51..6d0bc20d7 100755 --- a/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/ActivityIntentResolverRegistry.java +++ b/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/ActivityIntentResolverRegistry.java @@ -28,8 +28,9 @@ import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._30; import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._31; import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._32; +import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._33; -@XposedHook(targetSdkVersion = {_21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32}) +@XposedHook(targetSdkVersion = {_21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33}) public class ActivityIntentResolverRegistry implements IXposedHook { // https://github.com/LineageOS/android_frameworks_base/blob/lineage-15.1/services/core/java/com/android/server/am/BroadcastQueue.java diff --git a/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/DelegateRegistry.java b/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/DelegateRegistry.java index 6baa03c95..92ff4f272 100644 --- a/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/DelegateRegistry.java +++ b/android/plugins/plugin_push_message_delegate_server/src/main/java/github/tornaco/android/plugin/push/message/delegate/hooks/DelegateRegistry.java @@ -17,9 +17,10 @@ import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._30; import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._31; import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._32; +import static github.tornaco.xposed.annotation.XposedHook.SdkVersions._33; @AllArgsConstructor -@XposedHook(targetSdkVersion = {_21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32}) +@XposedHook(targetSdkVersion = {_21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33}) public class DelegateRegistry implements IXposedHook { @Override