Skip to content

Display and control your Android device

Use non-secure display for Android 12 preview

Romain Vimont16a63e0917e4
diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
index 9a149241..2f7109c5 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@@ -226,8 +226,10 @@ public class ScreenEncoder implements Device.RotationListener {
}
private static IBinder createDisplay() {
- // Since Android 12, secure displays could not be created with shell permissions anymore
- boolean secure = Build.VERSION.SDK_INT <= Build.VERSION_CODES.R;
+ // Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
+ // On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
+ boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S"
+ .equals(Build.VERSION.CODENAME));
return SurfaceControl.createDisplay("scrcpy", secure);
}