[TEST ONLY] Upgrade to SDL 2.27.1 (SDL 2.28 RC1)

Suppress lint "DiscouragedPrivateApi" in Workarounds.java.

app/prebuilt-deps/prepare-sdl.sh

@@ -6,10 +6,10 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"
 
-DEP_DIR=SDL2-2.26.4
+DEP_DIR=SDL2-2.27.1
 
-FILENAME=SDL2-devel-2.26.4-mingw.tar.gz
-SHA256SUM=fe899c8642caac2f180b1ee6f786857ddcaa0adc1fa82474312b09dd47d74712
+FILENAME=SDL2-devel-2.27.1-mingw.tar.gz
+SHA256SUM=a4850c06eab7f6825a517c3dfbf143da049f42be4d34aa6c8d3591ffa4679c44
 
 if [[ -d "$DEP_DIR" ]]
 then

cross_win32.txt

@@ -17,5 +17,5 @@ endian = 'little'
 
 [properties]
 prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win32'
-prebuilt_sdl2 = 'SDL2-2.26.4/i686-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.27.1/i686-w64-mingw32'
 prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-Win32'

cross_win64.txt

@@ -17,5 +17,5 @@ endian = 'little'
 
 [properties]
 prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win64'
-prebuilt_sdl2 = 'SDL2-2.26.4/x86_64-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.27.1/x86_64-w64-mingw32'
 prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-x64'

release.mk

@@ -101,7 +101,7 @@ dist-win32: build-server build-win32
 	cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.26.4/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.27.1/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/bin/msys-usb-1.0.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 
 dist-win64: build-server build-win64
@@ -119,7 +119,7 @@ dist-win64: build-server build-win64
 	cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.26.4/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.27.1/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/bin/msys-usb-1.0.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 
 zip-win32: dist-win32

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

@@ -1,16 +1,11 @@
 package com.genymobile.scrcpy;
 
-import com.genymobile.scrcpy.wrappers.ActivityThread;
-
 import android.annotation.TargetApi;
 import android.content.AttributionSource;
-import android.content.Context;
 import android.content.ContextWrapper;
 import android.os.Build;
 import android.os.Process;
 
-import java.lang.reflect.Method;
-
 public final class FakeContext extends ContextWrapper {
 
     public static final String PACKAGE_NAME = "com.android.shell";
@@ -18,25 +13,12 @@ public final class FakeContext extends ContextWrapper {
 
     private static final FakeContext INSTANCE = new FakeContext();
 
-    private static Context retrieveSystemContext() {
-        try {
-            Class<?> activityThreadClass = ActivityThread.getActivityThreadClass();
-            Object activityThread = ActivityThread.getActivityThread();
-
-            Method getSystemContextMethod = activityThreadClass.getDeclaredMethod("getSystemContext");
-            return (Context) getSystemContextMethod.invoke(activityThread);
-        } catch (Exception e) {
-            Ln.e("Cannot retrieve system context", e);
-            return null;
-        }
-    }
-
     public static FakeContext get() {
         return INSTANCE;
     }
 
     private FakeContext() {
-        super(retrieveSystemContext());
+        super(null);
     }
 
     @Override

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

@@ -87,7 +87,7 @@ public final class Server {
     }
 
     private static void scrcpy(Options options) throws IOException, ConfigurationException {
-        Ln.i("Device: [" + Build.MANUFACTURER + "] " + Build.BRAND + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
+        Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
         final Device device = new Device(options);
 
         Thread initThread = startInitThread(options);
@@ -109,7 +109,7 @@ public final class Server {
         // But only apply when strictly necessary, since workarounds can cause other issues:
         //  - <https://github.com/Genymobile/scrcpy/issues/940>
         //  - <https://github.com/Genymobile/scrcpy/issues/994>
-        if (Build.BRAND.equalsIgnoreCase("meizu") || Build.BRAND.equalsIgnoreCase("honor")) {
+        if (Build.BRAND.equalsIgnoreCase("meizu")) {
             Workarounds.fillAppInfo();
         }
 

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

@@ -1,7 +1,5 @@
 package com.genymobile.scrcpy;
 
-import com.genymobile.scrcpy.wrappers.ActivityThread;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Application;
@@ -22,7 +20,8 @@ import java.lang.reflect.Method;
 
 public final class Workarounds {
 
-    private static boolean activityThreadFilled;
+    private static Class<?> activityThreadClass;
+    private static Object activityThread;
 
     private Workarounds() {
         // not instantiable
@@ -43,16 +42,17 @@ public final class Workarounds {
 
     @SuppressLint("PrivateApi,DiscouragedPrivateApi")
     private static void fillActivityThread() throws Exception {
-        if (!activityThreadFilled) {
-            Class<?> activityThreadClass = ActivityThread.getActivityThreadClass();
-            Object activityThread = ActivityThread.getActivityThread();
+        if (activityThread == null) {
+            // ActivityThread activityThread = new ActivityThread();
+            activityThreadClass = Class.forName("android.app.ActivityThread");
+            Constructor<?> activityThreadConstructor = activityThreadClass.getDeclaredConstructor();
+            activityThreadConstructor.setAccessible(true);
+            activityThread = activityThreadConstructor.newInstance();
 
             // ActivityThread.sCurrentActivityThread = activityThread;
             Field sCurrentActivityThreadField = activityThreadClass.getDeclaredField("sCurrentActivityThread");
             sCurrentActivityThreadField.setAccessible(true);
             sCurrentActivityThreadField.set(null, activityThread);
-
-            activityThreadFilled = true;
         }
     }
 
@@ -75,9 +75,6 @@ public final class Workarounds {
             appInfoField.setAccessible(true);
             appInfoField.set(appBindData, applicationInfo);
 
-            Class<?> activityThreadClass = ActivityThread.getActivityThreadClass();
-            Object activityThread = ActivityThread.getActivityThread();
-
             // activityThread.mBoundApplication = appBindData;
             Field mBoundApplicationField = activityThreadClass.getDeclaredField("mBoundApplication");
             mBoundApplicationField.setAccessible(true);
@@ -98,9 +95,6 @@ public final class Workarounds {
             baseField.setAccessible(true);
             baseField.set(app, FakeContext.get());
 
-            Class<?> activityThreadClass = ActivityThread.getActivityThreadClass();
-            Object activityThread = ActivityThread.getActivityThread();
-
             // activityThread.mInitialApplication = app;
             Field mInitialApplicationField = activityThreadClass.getDeclaredField("mInitialApplication");
             mInitialApplicationField.setAccessible(true);

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

@@ -1,32 +0,0 @@
-package com.genymobile.scrcpy.wrappers;
-
-import java.lang.reflect.Constructor;
-
-public class ActivityThread {
-
-    private static final Class<?> activityThreadClass;
-    private static final Object activityThread;
-
-    static {
-        try {
-            activityThreadClass = Class.forName("android.app.ActivityThread");
-            Constructor<?> activityThreadConstructor = activityThreadClass.getDeclaredConstructor();
-            activityThreadConstructor.setAccessible(true);
-            activityThread = activityThreadConstructor.newInstance();
-        } catch (Exception e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private ActivityThread() {
-        // only static methods
-    }
-
-    public static Object getActivityThread() {
-        return activityThread;
-    }
-
-    public static Class<?> getActivityThreadClass() {
-        return activityThreadClass;
-    }
-}