Ignore unknown methods in IDisplayWindowListener

New Android versions may add methods to IDisplayWindowListener.aidl.
When these methods are called by the system, they result in an
AbstractMethodError because they are not implemented on the scrcpy side.

To avoid releasing a new version for each newly added method, ignore
them at the Binder level.

Refs afaca80b37
Fixes #6362 <https://github.com/Genymobile/scrcpy/issues/6362>

README.md

@@ -2,7 +2,7 @@
 source for the project. Do not download releases from random websites, even if
 their name contains `scrcpy`.**
 
-# scrcpy (v3.3.3)
+# scrcpy (v3.3.2)
 
 <img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
 

app/meson.build

@@ -112,19 +112,13 @@ cc = meson.get_compiler('c')
 
 static = get_option('static')
 
-sdl2_proj = subproject('sdl2')
-sdl2_dep = sdl2_proj.get_variable('sdl2_dep')
-
-meson.override_dependency('sdl2', sdl2_dep)
-
 dependencies = [
     dependency('libavformat', version: '>= 57.33', static: static),
     dependency('libavcodec', version: '>= 57.37', static: static),
     dependency('libavutil', static: static),
     dependency('libswresample', static: static),
-    dependency('sdl2', static: static),
+    dependency('sdl2', version: '>= 2.0.5', static: static),
 ]
-#dependency('sdl2', version: '>= 2.0.5', static: static),
 
 if v4l2_support
     dependencies += dependency('libavdevice', static: static)

app/scrcpy-windows.rc

@@ -13,7 +13,7 @@ BEGIN
       VALUE "LegalCopyright", "Romain Vimont, Genymobile"
       VALUE "OriginalFilename", "scrcpy.exe"
       VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "3.3.3"
+      VALUE "ProductVersion", "3.3.2"
     END
   END
   BLOCK "VarFileInfo"

app/src/device_msg.c

@@ -53,7 +53,7 @@ sc_device_msg_deserialize(const uint8_t *buf, size_t len,
             }
             uint16_t id = sc_read16be(&buf[1]);
             size_t size = sc_read16be(&buf[3]);
-            if (size > len - 5) {
+            if (size < len - 5) {
                 return 0; // not available
             }
             uint8_t *data = malloc(size);

app/src/display.c

@@ -170,7 +170,6 @@ sc_display_set_pending_frame(struct sc_display *display, const AVFrame *frame) {
         }
     }
 
-    av_frame_unref(display->pending.frame);
     int r = av_frame_ref(display->pending.frame, frame);
     if (r) {
         LOGE("Could not ref frame: %d", r);
@@ -182,11 +181,6 @@ sc_display_set_pending_frame(struct sc_display *display, const AVFrame *frame) {
     return true;
 }
 
-// Forward declaration
-static bool
-sc_display_update_texture_internal(struct sc_display *display,
-                                   const AVFrame *frame);
-
 static bool
 sc_display_apply_pending(struct sc_display *display) {
     if (display->pending.flags & SC_DISPLAY_PENDING_FLAG_SIZE) {
@@ -202,8 +196,7 @@ sc_display_apply_pending(struct sc_display *display) {
 
     if (display->pending.flags & SC_DISPLAY_PENDING_FLAG_FRAME) {
         assert(display->pending.frame);
-        bool ok = sc_display_update_texture_internal(display,
-                                                     display->pending.frame);
+        bool ok = sc_display_update_texture(display, display->pending.frame);
         if (!ok) {
             return false;
         }

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.0'
+        classpath 'com.android.tools.build:gradle:8.7.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

doc/build.md

@@ -233,10 +233,10 @@ install` must be run as root)._
 
 #### Option 2: Use prebuilt server
 
- - [`scrcpy-server-v3.3.3`][direct-scrcpy-server]  
-   <sub>SHA-256: `7e70323ba7f259649dd4acce97ac4fefbae8102b2c6d91e2e7be613fd5354be0`</sub>
+ - [`scrcpy-server-v3.3.2`][direct-scrcpy-server]  
+   <sub>SHA-256: `2ee5ca0863ef440f5b7c75856bb475c5283d0a8359cb370b1c161314fd29dfd9`</sub>
 
-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-server-v3.3.3
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.2/scrcpy-server-v3.3.2
 
 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:

doc/linux.md

@@ -6,11 +6,11 @@
 
 Download a static build of the [latest release]:
 
- - [`scrcpy-linux-x86_64-v3.3.3.tar.gz`][direct-linux-x86_64] (x86_64)  
-   <sub>SHA-256: `9b30e813e8191329ba8025dc80cb0f198fb0a318960a3b5c15395cf675c9c638`</sub>
+ - [`scrcpy-linux-x86_64-v3.3.2.tar.gz`][direct-linux-x86_64] (x86_64)  
+   <sub>SHA-256: `92bed0fa274b9165eb8740e07cf2e2692ebe09ad6911175b0ee42e08799dc51c`</sub>
 
 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-linux-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-linux-x86_64-v3.3.3.tar.gz
+[direct-linux-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.2/scrcpy-linux-x86_64-v3.3.2.tar.gz
 
 and extract it.
 

doc/macos.md

@@ -6,15 +6,15 @@
 
 Download a static build of the [latest release]:
 
- - [`scrcpy-macos-aarch64-v3.3.3.tar.gz`][direct-macos-aarch64] (aarch64)  
-   <sub>SHA-256: `b93299468f19ae89ac70f7c1453914c41f1f2bcd31f6ab530038da885c19581f`</sub>
+ - [`scrcpy-macos-aarch64-v3.3.2.tar.gz`][direct-macos-aarch64] (aarch64)  
+   <sub>SHA-256: `a213eeff8ac95893e69c4bc6a001a402c6680dbfcb74cb353c0124184ed88e8d`</sub>
 
- - [`scrcpy-macos-x86_64-v3.3.3.tar.gz`][direct-macos-x86_64] (x86_64)  
-   <sub>SHA-256: `c767fc1d41e4ae26e40558656570962f474739924fd22ee023d8754889ee4366`</sub>
+ - [`scrcpy-macos-x86_64-v3.3.2.tar.gz`][direct-macos-x86_64] (x86_64)  
+   <sub>SHA-256: `2a1b27fbb67821a886c7e8dea641899836c0abbe7afd37905584b99bcd21bc04`</sub>
 
 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-macos-aarch64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-macos-aarch64-v3.3.3.tar.gz
-[direct-macos-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-macos-x86_64-v3.3.3.tar.gz
+[direct-macos-aarch64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.2/scrcpy-macos-aarch64-v3.3.2.tar.gz
+[direct-macos-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.2/scrcpy-macos-x86_64-v3.3.2.tar.gz
 
 and extract it.
 

doc/windows.md

@@ -6,14 +6,14 @@
 
 Download the [latest release]:
 
- - [`scrcpy-win64-v3.3.3.zip`][direct-win64] (64-bit)  
-   <sub>SHA-256: `4b458d33d0436688c69875cd267cae6fa8be08aa3c17772edf3a940a3dc4b17e`</sub>
- - [`scrcpy-win32-v3.3.3.zip`][direct-win32] (32-bit)  
-   <sub>SHA-256: `e3d43e21c0bd6e070381c390c1e4cccd48a1e71ae73a8c217e6e6b8506598c79`</sub>
+ - [`scrcpy-win64-v3.3.2.zip`][direct-win64] (64-bit)  
+   <sub>SHA-256: `8f7b19371657b872e271e6b02a0c758c61c6e31e032e9df55a83aa3aab960bfa`</sub>
+ - [`scrcpy-win32-v3.3.2.zip`][direct-win32] (32-bit)  
+   <sub>SHA-256: `cff2bbebdcfe14a023b77cd601fc4420b5631b19bd4b09ce4dcd4e5bf8e63244`</sub>
 
 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-win64-v3.3.3.zip
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-win32-v3.3.3.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.2/scrcpy-win64-v3.3.2.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.2/scrcpy-win32-v3.3.2.zip
 
 and extract it.
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 # https://gradle.org/release-checksums/
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

install_release.sh

@@ -2,8 +2,8 @@
 set -e
 
 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-server-v3.3.3
-PREBUILT_SERVER_SHA256=7e70323ba7f259649dd4acce97ac4fefbae8102b2c6d91e2e7be613fd5354be0
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v3.3.2/scrcpy-server-v3.3.2
+PREBUILT_SERVER_SHA256=2ee5ca0863ef440f5b7c75856bb475c5283d0a8359cb370b1c161314fd29dfd9
 
 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server

meson.build

@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '3.3.3',
+        version: '3.3.2',
         meson_version: '>= 0.49',
         default_options: [
             'c_std=c11',

server/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace = 'com.genymobile.scrcpy'
-    compileSdk 36
+    namespace 'com.genymobile.scrcpy'
+    compileSdk 35
     defaultConfig {
-        applicationId = "com.genymobile.scrcpy"
+        applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
-        targetSdkVersion 36
-        versionCode 30303
-        versionName "3.3.3"
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 35
+        versionCode 30302
+        versionName "3.3.2"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -18,11 +18,8 @@ android {
         }
     }
     buildFeatures {
-        buildConfig = true
-        aidl = true
-    }
-    lint {
-        disable 'UseRequiresApi'
+        buildConfig true
+        aidl true
     }
 }
 

server/build_without_gradle.sh

@@ -12,10 +12,10 @@
 set -e
 
 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=3.3.3
+SCRCPY_VERSION_NAME=3.3.2
 
-PLATFORM=${ANDROID_PLATFORM:-36}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-36.0.0}
+PLATFORM=${ANDROID_PLATFORM:-35}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-35.0.0}
 PLATFORM_TOOLS="$ANDROID_HOME/platforms/android-$PLATFORM"
 BUILD_TOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOLS"
 
@@ -86,7 +86,7 @@ javac -encoding UTF-8 -bootclasspath "$ANDROID_JAR" \
 echo "Dexing..."
 cd "$CLASSES_DIR"
 
-if [[ "${PLATFORM%%.*}" -lt 31 ]]
+if [[ $PLATFORM -lt 31 ]]
 then
     # use dx
     "$BUILD_TOOLS_DIR/dx" --dex --output "$BUILD_DIR/classes.dex" \

server/src/main/java/com/genymobile/scrcpy/CleanUp.java

@@ -196,7 +196,6 @@ public final class CleanUp {
 
         // Needed for workarounds
         prepareMainLooper();
-        Workarounds.apply();
 
         int displayId = Integer.parseInt(args[0]);
         int restoreStayOn = Integer.parseInt(args[1]);

server/src/main/java/com/genymobile/scrcpy/Server.java

@@ -226,11 +226,7 @@ public final class Server {
 
     private static void internalMain(String... args) throws Exception {
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
-            Thread.UncaughtExceptionHandler defaultHandler = Thread.getDefaultUncaughtExceptionHandler();
             Ln.e("Exception on thread " + t, e);
-            if (defaultHandler != null) {
-                defaultHandler.uncaughtException(t, e);
-            }
         });
 
         prepareMainLooper();

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayWindowListener.java

@@ -1,7 +1,5 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.util.Ln;
-
 import android.content.res.Configuration;
 import android.os.Parcel;
 import android.os.RemoteException;
@@ -28,7 +26,6 @@ public class DisplayWindowListener extends IDisplayWindowListener.Stub {
         try {
             return super.onTransact(code, data, reply, flags);
         } catch (AbstractMethodError e) {
-            Ln.v("Ignoring AbstractMethodError: " + e.getMessage());
             // Ignore unknown methods, write default response to reply parcel
             reply.writeNoException();
             return true;

subprojects/packagefiles/sdl2/meson.build

@@ -1,77 +0,0 @@
-project('sdl2', 'c')
-
-prefix = get_option('prefix')
-
-link_type = get_option('default_library')
-
-make_prog = find_program('make', required: true)
-
-configure_command = []
-
-configure_args = [
-  './configure',
-  '--prefix=' + prefix,
-]
-
-if host_machine.system() == 'linux'
-  configure_args += [
-    '--enable-video-wayland',
-    '--enable-video-x11',
-  ]
-endif
-
-if link_type == 'static'
-  configure_args += [
-    '--enable-static',
-    '--disable-shared',
-  ]
-else
-  configure_args += [
-    '--disable-static',
-    '--enable-shared',
-  ]
-endif
-
-if meson.is_cross_build()
-  configure_args += [
-    '--host=' + host_machine.cpu_family() + '-w64-mingw32',
-  ]
-endif
-
-configure_env = environment()
-configure_env.set('CFLAGS', '-O2')
-configure_env.set('CXXFLAGS', '-O2')
-
-configure_target = custom_target('sdl2_configure',
-  output: 'config.h',
-  command: configure_args,
-  env: configure_env,
-  console: true
-)
-
-if host_machine.system() == 'windows' and link_type == 'shared'
-  build_output = ['SDL2.dll']
-elif link_type == 'shared'
-  build_output = ['libSDL2.so']
-else
-  build_output = ['libSDL2.a']
-endif
-
-sdl2_build = custom_target('sdl2_build',
-  depends: configure_target,
-  output: build_output,
-  command: [make_prog, '-j'],
-  console: true,
-  build_by_default: true
-)
-
-sdl2_install = custom_target('sdl2_install',
-  depends: sdl2_build,
-  output: 'install_done',
-  command: [make_prog, 'install', '&&', 'touch', '@OUTPUT@'],
-  console: true,
-  build_by_default: true,
-  install: false
-)
-
-sdl2_dep = declare_dependency(sources: sdl2_install)

subprojects/sdl2.wrap

@@ -1,9 +0,0 @@
-[wrap-file]
-directory = SDL-release-2.32.8
-source_url = https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.32.8.tar.gz
-source_filename = libsdl2-2.32.8.tar.gz
-source_hash = dd35e05644ae527848d02433bec24dd0ea65db59faecf1a0e5d1880c533dac2c
-patch_directory = sdl2
-
-[provide]
-sdl2 = sdl2_dep