update compile sdk to 36

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -29,6 +29,13 @@ body:
       options:
         - label: I am using latest debug CI version
           required: true
+  - type: checkboxes
+    id: official
+    attributes:
+      label: LSPosed requirement
+      options:
+        - label: I am using official LSPosed version
+          required: true
   - type: textarea
     attributes:
       label: Behavior

.github/workflows/android.yml

@@ -23,10 +23,10 @@ jobs:
         path: libxposed/api
         fetch-depth: 0
 
-    - name: set up JDK 17
+    - name: set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: gradle
 
@@ -50,7 +50,6 @@ jobs:
         echo 'org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC' >> ~/.gradle/gradle.properties
         echo 'android.native.buildOutput=verbose' >> ~/.gradle/gradle.properties
         # build dependencies
-        sed -i 's/VERSION_21/VERSION_17/g' libxposed/api/checks/build.gradle.kts
         cd libxposed/api && ./gradlew publishToMavenLocal && cd ../..
         # build DisableFlagSecure
         chmod +x gradlew

README.md

@@ -1,6 +1,14 @@
 # Enable Screenshot (formerly known as Disable FLAG_SECURE)
 Enabling screenshots in apps that normally wouldn\'t allow it, and disabling screenshot(Android 14+) & screen record(Android 15+) detection.
 
+**Unofficial LSPosed versions are not supported.**
+
+## Supported OSes
+- Android 12-16 Beta 3 (Custom ROMs are **not** supported)
+- Xiaomi Hyper OS
+- OPlus OS (Color OS/Realme UI/Oxygen OS)
+- Samsung One UI
+
 ## Usage
 1. Enable the module
 2. Select **ONLY** recommended apps

app/build.gradle

@@ -3,15 +3,15 @@ plugins {
 }
 
 android {
-    compileSdk 35
-    buildToolsVersion "35.0.0"
+    compileSdk 36
+    buildToolsVersion "36.0.0"
 
     defaultConfig {
         applicationId "io.github.lsposed.disableflagsecure"
-        minSdkVersion 27
-        targetSdkVersion 35
+        minSdkVersion 31
+        targetSdkVersion 36
         versionCode rootProject.ext.commitCount
-        versionName "4.1.1"
+        versionName "4.2.0"
     }
 
     Properties localProperties = new Properties()
@@ -42,14 +42,15 @@ android {
             } else {
                 signingConfig signingConfigs.debug
             }
+            vcsInfo.include false
             minifyEnabled true
             proguardFiles 'proguard-rules.pro'
         }
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     lint {

app/src/main/java/io/github/lsposed/disableflagsecure/DisableFlagSecure.java

@@ -1,18 +1,16 @@
 package io.github.lsposed.disableflagsecure;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.hardware.display.DisplayManager;
 import android.os.Build;
-import android.util.Log;
 import android.view.SurfaceControl;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
@@ -48,7 +46,7 @@ public class DisableFlagSecure extends XposedModule {
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-            // Screen record detection (V)
+            // Screen record detection (V~Baklava)
             try {
                 hookWindowManagerService(classLoader);
             } catch (Throwable t) {
@@ -57,14 +55,15 @@ public class DisableFlagSecure extends XposedModule {
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            // Screenshot detection (U~V)
+            // Screenshot detection (U~Baklava)
             try {
                 hookActivityTaskManagerService(classLoader);
             } catch (Throwable t) {
                 log("hook ActivityTaskManagerService failed", t);
             }
 
-            // Xiaomi HyperOS (U)
+            // Xiaomi HyperOS (U~Baklava)
+            // OS2.0.250220.1.WOCCNXM.PRE
             try {
                 hookHyperOS(classLoader);
             } catch (ClassNotFoundException ignored) {
@@ -73,57 +72,53 @@ public class DisableFlagSecure extends XposedModule {
             }
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            // ScreenCapture in WindowManagerService (S~V)
-            try {
-                hookScreenCapture(classLoader);
-            } catch (Throwable t) {
-                log("hook ScreenCapture failed", t);
-            }
+        // ScreenCapture in WindowManagerService (S~Baklava)
+        try {
+            hookScreenCapture(classLoader);
+        } catch (Throwable t) {
+            log("hook ScreenCapture failed", t);
+        }
 
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                // Blackout permission check (S~T)
-                try {
-                    hookActivityManagerService(classLoader);
-                } catch (Throwable t) {
-                    log("hook ActivityManagerService failed", t);
-                }
-            }
-
-            // WifiDisplay (S~V) / OverlayDisplay (S~V) / VirtualDisplay (U~V)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            // Blackout permission check (S~T)
             try {
-                hookDisplayControl(classLoader);
+                hookActivityManagerService(classLoader);
             } catch (Throwable t) {
-                log("hook DisplayControl failed", t);
-            }
-
-            // VirtualDisplay with MediaProjection (S~V)
-            try {
-                hookVirtualDisplayAdapter(classLoader);
-            } catch (Throwable t) {
-                log("hook VirtualDisplayAdapter failed", t);
+                log("hook ActivityManagerService failed", t);
             }
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            // OneUI
-            try {
-                hookScreenshotHardwareBuffer(classLoader);
-            } catch (Throwable t) {
-                if (!(t instanceof ClassNotFoundException)) {
-                    log("hook ScreenshotHardwareBuffer failed", t);
-                }
+        // WifiDisplay (S~Baklava) / OverlayDisplay (S~Baklava) / VirtualDisplay (U~Baklava)
+        try {
+            hookDisplayControl(classLoader);
+        } catch (Throwable t) {
+            log("hook DisplayControl failed", t);
+        }
+
+        // VirtualDisplay with MediaProjection (S~Baklava)
+        try {
+            hookVirtualDisplayAdapter(classLoader);
+        } catch (Throwable t) {
+            log("hook VirtualDisplayAdapter failed", t);
+        }
+
+        // OneUI
+        try {
+            hookScreenshotHardwareBuffer(classLoader);
+        } catch (Throwable t) {
+            if (!(t instanceof ClassNotFoundException)) {
+                log("hook ScreenshotHardwareBuffer failed", t);
             }
-            try {
-                hookOneUI(classLoader);
-            } catch (Throwable t) {
-                if (!(t instanceof ClassNotFoundException)) {
-                    log("hook OneUI failed", t);
-                }
+        }
+        try {
+            hookOneUI(classLoader);
+        } catch (Throwable t) {
+            if (!(t instanceof ClassNotFoundException)) {
+                log("hook OneUI failed", t);
             }
         }
 
-        // secureLocked flag (S-)
+        // secureLocked flag
         try {
             // Screenshot
             hookWindowState(classLoader);
@@ -135,8 +130,10 @@ public class DisableFlagSecure extends XposedModule {
         // dumpsys window screenshot systemQuickTileScreenshotOut display_id=0
         try {
             hookOplus(classLoader);
-        } catch (Throwable ignored) {
-
+        } catch (Throwable t) {
+            if (!(t instanceof ClassNotFoundException)) {
+                log("hook Oplus failed", t);
+            }
         }
     }
 
@@ -173,9 +170,9 @@ public class DisableFlagSecure extends XposedModule {
             case SYSTEMUI:
             case MIUI_SCREENSHOT:
                 if (OPLUS_APPPLATFORM.equals(pn) || OPLUS_SCREENSHOT.equals(pn) ||
-                        (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-                                Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) {
-                    // ScreenCapture in App (S~T) (OPlus S-V)
+                        Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                    // ScreenCapture in App (S~T) (OPlus S~V)
+                    // TODO: test Oplus Baklava
                     try {
                         hookScreenCapture(classLoader);
                     } catch (Throwable t) {
@@ -227,19 +224,12 @@ public class DisableFlagSecure extends XposedModule {
 
     private void hookWindowState(ClassLoader classLoader) throws ClassNotFoundException, NoSuchMethodException {
         var windowStateClazz = classLoader.loadClass("com.android.server.wm.WindowState");
-        Method isSecureLockedMethod;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            isSecureLockedMethod = windowStateClazz.getDeclaredMethod("isSecureLocked");
-        } else {
-            var windowManagerServiceClazz = classLoader.loadClass("com.android.server.wm.WindowManagerService");
-            isSecureLockedMethod = windowManagerServiceClazz.getDeclaredMethod("isSecureLocked", windowStateClazz);
-        }
+        var isSecureLockedMethod = windowStateClazz.getDeclaredMethod("isSecureLocked");
         hook(isSecureLockedMethod, SecureLockedHooker.class);
     }
 
     private static Field captureSecureLayersField;
 
-    @TargetApi(Build.VERSION_CODES.S)
     private void hookScreenCapture(ClassLoader classLoader) throws ClassNotFoundException, NoSuchFieldException {
         var screenCaptureClazz = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE ?
                 classLoader.loadClass("android.window.ScreenCapture") :
@@ -253,7 +243,6 @@ public class DisableFlagSecure extends XposedModule {
         hookMethods(screenCaptureClazz, ScreenCaptureHooker.class, "nativeCaptureLayers");
     }
 
-    @TargetApi(Build.VERSION_CODES.S)
     private void hookDisplayControl(ClassLoader classLoader) throws ClassNotFoundException, NoSuchMethodException {
         var displayControlClazz = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE ?
                 classLoader.loadClass("com.android.server.display.DisplayControl") :
@@ -265,13 +254,12 @@ public class DisableFlagSecure extends XposedModule {
         hook(method, CreateDisplayHooker.class);
     }
 
-    @TargetApi(Build.VERSION_CODES.S)
     private void hookVirtualDisplayAdapter(ClassLoader classLoader) throws ClassNotFoundException {
         var displayControlClazz = classLoader.loadClass("com.android.server.display.VirtualDisplayAdapter");
         hookMethods(displayControlClazz, CreateVirtualDisplayLockedHooker.class, "createVirtualDisplayLocked");
     }
 
-    @TargetApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+    @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     private void hookActivityTaskManagerService(ClassLoader classLoader) throws ClassNotFoundException, NoSuchMethodException {
         var activityTaskManagerServiceClazz = classLoader.loadClass("com.android.server.wm.ActivityTaskManagerService");
         var iBinderClazz = classLoader.loadClass("android.os.IBinder");
@@ -280,7 +268,7 @@ public class DisableFlagSecure extends XposedModule {
         hook(method, ReturnNullHooker.class);
     }
 
-    @TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
+    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
     private void hookWindowManagerService(ClassLoader classLoader) throws ClassNotFoundException, NoSuchMethodException {
         var windowManagerServiceClazz = classLoader.loadClass("com.android.server.wm.WindowManagerService");
         var iScreenRecordingCallbackClazz = classLoader.loadClass("android.window.IScreenRecordingCallback");
@@ -288,20 +276,18 @@ public class DisableFlagSecure extends XposedModule {
         hook(method, ReturnFalseHooker.class);
     }
 
-    @TargetApi(Build.VERSION_CODES.S)
     private void hookActivityManagerService(ClassLoader classLoader) throws ClassNotFoundException, NoSuchMethodException {
         var activityTaskManagerServiceClazz = classLoader.loadClass("com.android.server.am.ActivityManagerService");
         var method = activityTaskManagerServiceClazz.getDeclaredMethod("checkPermission", String.class, int.class, int.class);
         hook(method, CheckPermissionHooker.class);
     }
 
-    @TargetApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+    @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     private void hookHyperOS(ClassLoader classLoader) throws ClassNotFoundException {
         var windowManagerServiceImplClazz = classLoader.loadClass("com.android.server.wm.WindowManagerServiceImpl");
         hookMethods(windowManagerServiceImplClazz, ReturnFalseHooker.class, "notAllowCaptureDisplay");
     }
 
-    @TargetApi(Build.VERSION_CODES.S)
     private void hookScreenshotHardwareBuffer(ClassLoader classLoader) throws ClassNotFoundException, NoSuchMethodException {
         var screenshotHardwareBufferClazz = classLoader.loadClass(
                 Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE ?
@@ -311,7 +297,7 @@ public class DisableFlagSecure extends XposedModule {
         hook(method, ReturnFalseHooker.class);
     }
 
-    @TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
+    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
     private void hookOplusScreenCapture(ClassLoader classLoader) throws ClassNotFoundException, NoSuchMethodException {
         var oplusScreenCaptureClazz = classLoader.loadClass("com.oplus.screenshot.OplusScreenCapture$CaptureArgs$Builder");
         var method = oplusScreenCaptureClazz.getDeclaredMethod("setUid", long.class);
@@ -324,7 +310,6 @@ public class DisableFlagSecure extends XposedModule {
         hookMethods(longshotMainClazz, ReturnFalseHooker.class, "hasSecure");
     }
 
-    @TargetApi(Build.VERSION_CODES.S)
     private void hookOneUI(ClassLoader classLoader) throws ClassNotFoundException {
         var wmScreenshotControllerClazz = classLoader.loadClass("com.android.server.wm.WmScreenshotController");
         hookMethods(wmScreenshotControllerClazz, ReturnTrueHooker.class, "canBeScreenshotTarget");
@@ -348,9 +333,12 @@ public class DisableFlagSecure extends XposedModule {
         @BeforeInvocation
         public static void before(@NonNull BeforeHookCallback callback) {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                String stack = Log.getStackTraceString(new Throwable());
-                if (stack.contains("createVirtualDisplayLocked")) {
-                    return;
+                var stackTrace = new Throwable().getStackTrace();
+                for (int i = 4; i < stackTrace.length && i < 8; i++) {
+                    var name = stackTrace[i].getMethodName();
+                    if (name.equals("createVirtualDisplayLocked")) {
+                        return;
+                    }
                 }
             }
             callback.getArgs()[1] = true;
@@ -398,7 +386,7 @@ public class DisableFlagSecure extends XposedModule {
         @BeforeInvocation
         public static void before(@NonNull BeforeHookCallback callback) {
             var caller = (int) callback.getArgs()[2];
-            if (caller != 1000 && callback.getArgs()[1] == null) {
+            if (caller >= 10000 && callback.getArgs()[1] == null) {
                 // not os and not media projection
                 return;
             }
@@ -420,12 +408,22 @@ public class DisableFlagSecure extends XposedModule {
 
         @BeforeInvocation
         public static void before(@NonNull BeforeHookCallback callback) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                String stack = Log.getStackTraceString(new Throwable());
-                // don't change surface flags, but passing other checks
-                if (stack.contains("setInitialSurfaceControlProperties")
-                        || stack.contains("createSurfaceLocked")) {
-                    return;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                var walker = StackWalker.getInstance();
+                var match = walker.walk(frames -> frames
+                        .map(StackWalker.StackFrame::getMethodName)
+                        .limit(6)
+                        .skip(2)
+                        .anyMatch(s -> s.equals("setInitialSurfaceControlProperties") || s.equals("createSurfaceLocked")));
+                if (match) return;
+            } else {
+                var stackTrace = new Throwable().getStackTrace();
+                for (int i = 4; i < stackTrace.length && i < 8; i++) {
+                    var name = stackTrace[i].getMethodName();
+                    if (name.equals("setInitialSurfaceControlProperties") ||
+                            name.equals("createSurfaceLocked")) {
+                        return;
+                    }
                 }
             }
             callback.returnAndSkip(false);

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'com.android.application' version '8.7.2' apply false
+    id 'com.android.application' version '8.9.1' apply false
     id 'org.lsposed.lsplugin.jgit' version "1.1"
 }
 
 tasks.register('clean', Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
 
 var repo = jgit.repo(true)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

libxposed-compat/build.gradle

@@ -9,12 +9,10 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 35
-        versionCode 1
-        versionName "1.0"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }