fix: VolumeDisableSafe to a15

ReChronoRain · Jan 1, 2025 · 7813f5e · 7813f5e
1 parent 334d5ba
commit 7813f5e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 23 deletions.
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenShot.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/ScreenShot.java
@@ -18,8 +18,6 @@
 */
 package com.sevtinge.hyperceiler.module.app;
 
-import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion;
-
 import android.text.TextUtils;
 
 import com.hchen.database.HookBase;
@@ -42,6 +40,6 @@ public void handleLoadPackage() {
         initHook(UnlockPrivacyMarking.INSTANCE, mPrefsMap.getBoolean("screenshot_unlock_privacy_marking"));
         // 超级剪切板
         initHook(UnlockSuperClipboard.INSTANCE, mPrefsMap.getStringAsInt("various_super_clipboard_e", 0) != 0);
-        initHook(new FlagSecure(), mPrefsMap.getBoolean("system_other_flag_secure") && isMoreAndroidVersion(33));
+        initHook(new FlagSecure(), mPrefsMap.getBoolean("system_other_flag_secure"));
     }
 }
diff --git a/...c/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Pad/SystemFrameworkU.java b/...c/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Pad/SystemFrameworkU.java
@@ -168,7 +168,6 @@ public void handleLoadPackage() {
 
         // Other
         initHook(new PackagePermissions(), true);
-        initHook(new RotationButton(), mPrefsMap.getStringAsInt("system_framework_other_rotation_button_int", 0) == 2);
         initHook(new GlobalActions(), mLoadPackageParam.processName.equals("android"));
         initHook(new ThermalBrightness(), mPrefsMap.getBoolean("system_framework_other_thermal_brightness"));
         initHook(DisableCleaner.INSTANCE, mPrefsMap.getBoolean("system_framework_other_disable_cleaner"));

diff --git a/...c/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Pad/SystemFrameworkV.java b/...c/main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Pad/SystemFrameworkV.java
@@ -172,7 +172,6 @@ public void handleLoadPackage() {
 
         // Other
         initHook(new PackagePermissions(), true);
-        initHook(new RotationButton(), mPrefsMap.getStringAsInt("system_framework_other_rotation_button_int", 0) == 2);
         initHook(new GlobalActions(), mLoadPackageParam.processName.equals("android"));
         initHook(new ThermalBrightness(), mPrefsMap.getBoolean("system_framework_other_thermal_brightness"));
         initHook(DisableCleaner.INSTANCE, mPrefsMap.getBoolean("system_framework_other_disable_cleaner"));

diff --git a/...main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkU.java b/...main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkU.java
@@ -157,7 +157,6 @@ public void handleLoadPackage() {
 
         // Other
         initHook(new PackagePermissions(), true);
-        initHook(new RotationButton(), mPrefsMap.getStringAsInt("system_framework_other_rotation_button_int", 0) == 2);
         initHook(new GlobalActions(), mLoadPackageParam.processName.equals("android"));
         initHook(new ThermalBrightness(), mPrefsMap.getBoolean("system_framework_other_thermal_brightness"));
         initHook(DisableCleaner.INSTANCE, mPrefsMap.getBoolean("system_framework_other_disable_cleaner"));

diff --git a/...main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkV.java b/...main/java/com/sevtinge/hyperceiler/module/app/SystemFramework/Phone/SystemFrameworkV.java
@@ -161,7 +161,6 @@ public void handleLoadPackage() {
 
         // Other
         initHook(new PackagePermissions(), true);
-        initHook(new RotationButton(), mPrefsMap.getStringAsInt("system_framework_other_rotation_button_int", 0) == 2);
         initHook(new GlobalActions(), mLoadPackageParam.processName.equals("android"));
         initHook(new ThermalBrightness(), mPrefsMap.getBoolean("system_framework_other_thermal_brightness"));
         initHook(DisableCleaner.INSTANCE, mPrefsMap.getBoolean("system_framework_other_disable_cleaner"));

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemframework/FlagSecure.java b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemframework/FlagSecure.java
@@ -145,17 +145,15 @@ protected void before(MethodHookParam param) throws Throwable {
                 }
 
                 // Xiaomi HyperOS (U)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    try {
-                        var windowManagerServiceImplClazz = XposedHelpers.findClass("com.android.server.wm.WindowManagerServiceImpl", lpparam.classLoader);
-                        XposedHelpers.findAndHookMethod(
-                                windowManagerServiceImplClazz,
-                                "notAllowCaptureDisplay",
-                                XposedHelpers.findClass("com.android.server.wm.RootWindowContainer", lpparam.classLoader), int.class,
-                                XC_MethodReplacement.returnConstant(false));
-                    } catch (Throwable t) {
-                        logE(TAG, this.lpparam.packageName, "hook HyperOS failed", t);
-                    }
+                try {
+                    var windowManagerServiceImplClazz = XposedHelpers.findClass("com.android.server.wm.WindowManagerServiceImpl", lpparam.classLoader);
+                    XposedHelpers.findAndHookMethod(
+                            windowManagerServiceImplClazz,
+                            "notAllowCaptureDisplay",
+                            XposedHelpers.findClass("com.android.server.wm.RootWindowContainer", lpparam.classLoader), int.class,
+                            XC_MethodReplacement.returnConstant(false));
+                } catch (Throwable t) {
+                    logE(TAG, this.lpparam.packageName, "hook HyperOS failed", t);
                 }
             }
 

diff --git a/...src/main/java/com/sevtinge/hyperceiler/module/hook/systemframework/VolumeDisableSafe.java b/...src/main/java/com/sevtinge/hyperceiler/module/hook/systemframework/VolumeDisableSafe.java
@@ -37,9 +37,13 @@ public class VolumeDisableSafe extends BaseHook {
     @Override
     public void init() {
         if (isMoreAndroidVersion(34)) {
-            String SoundDoseHelperStub = isMoreAndroidVersion(35) ?
-                    "com.android.server.audio.SoundDoseHelperStub" :
-                    "com.android.server.audio.SoundDoseHelperStubImpl";
+            Class<?> SoundDoseHelperStub;
+            Class<?> SoundDoseHelper = findClass("com.android.server.audio.SoundDoseHelper", lpparam.classLoader);
+            try {
+                SoundDoseHelperStub = findClass("com.android.server.audio.SoundDoseHelperStub", lpparam.classLoader);
+            } catch (Throwable t) {
+                SoundDoseHelperStub = findClass("com.android.server.audio.SoundDoseHelperStubImpl", lpparam.classLoader);
+            }
 
             findAndHookMethod(SoundDoseHelperStub, "updateSafeMediaVolumeIndex", int.class, new MethodHook() {
                 @Override
@@ -52,7 +56,7 @@ protected void before(MethodHookParam param) throws Throwable {
                 }
             });
 
-            findAndHookMethod("com.android.server.audio.SoundDoseHelper", "safeMediaVolumeIndex", int.class, new MethodHook() {
+            findAndHookMethod(SoundDoseHelper, "safeMediaVolumeIndex", int.class, new MethodHook() {
                 @Override
                 protected void before(MethodHookParam param) throws Throwable {
                     if (mode == 1) {
@@ -63,7 +67,7 @@ protected void before(MethodHookParam param) throws Throwable {
                 }
             });
 
-            hookAllConstructors("com.android.server.audio.SoundDoseHelper", new MethodHook() {
+            hookAllConstructors(SoundDoseHelper, new MethodHook() {
                 @Override
                 protected void after(MethodHookParam param) throws Throwable {
                     if (mode == 1) {