Simplify settings access

For Android >= 12, scrcpy executed "settings" commands (in a new
process) rather than using the ContentProvider directly, due to
permission issues [1].

However, these permission issues were resolved by introducing
FakeContext.getContentResolver() [2].

Therefore, remove the use of "settings" commands and use the
ContentProvider directly in all cases.

Refs [1] cc0902b13c87fc98b1ed90b0700cc53ac4d7ee3c
Refs [2] 91373d906b100349de959f49172d4605f66f64b2
Refs #6224 comment <https://github.com/Genymobile/scrcpy/issues/6224#issuecomment-3078418268>

.github/workflows/release.yml

@@ -202,8 +202,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-            brew install meson ninja nasm libiconv zlib automake autoconf \
-                libtool
+            brew install meson nasm libiconv zlib automake autoconf libtool
 
       - name: Build
         env:
@@ -245,7 +244,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install dependencies
-        run: brew install meson ninja nasm libiconv zlib automake
+        run: brew install meson nasm libiconv zlib automake
              # autoconf and libtool are already installed on macos-13
 
       - name: Build

app/deps/adb_macos.sh

@@ -7,7 +7,7 @@ cd "$DEPS_DIR"
 VERSION=36.0.0
 FILENAME=platform-tools_r$VERSION-darwin.zip
 PROJECT_DIR=platform-tools-$VERSION-darwin
-SHA256SUM=b241878e6ec20650b041bf715ea05f7d5dc73bd24529464bd9cf68946e3132bd
+SHA256SUM=d3e9fa1df3345cf728586908426615a60863d2632f73f1ce14f0f1349ef000fd
 
 cd "$SOURCES_DIR"
 

app/deps/adb_windows.sh

@@ -7,7 +7,7 @@ cd "$DEPS_DIR"
 VERSION=36.0.0
 FILENAME=platform-tools_r$VERSION-win.zip
 PROJECT_DIR=platform-tools-$VERSION-windows
-SHA256SUM=24bd8bebbbb58b9870db202b5c6775c4a49992632021c60750d9d8ec8179d5f0
+SHA256SUM=12c2841f354e92a0eb2fd7bf6f0f9bf8538abce7bd6b060ac8349d6f6a61107c
 
 cd "$SOURCES_DIR"
 

app/deps/sdl.sh

@@ -28,7 +28,7 @@ export CXXFLAGS="$CFLAGS"
 
 if [[ -d "$DIRNAME" ]]
 then
-    echo "'$PWD/$HDIRNAME' already exists, not reconfigured"
+    echo "'$PWD/$DIRNAME' already exists, not reconfigured"
     cd "$DIRNAME"
 else
     mkdir "$DIRNAME"

app/src/adb/adb.c

@@ -103,7 +103,7 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {
 
 static void
 show_adb_installation_msg(void) {
-#ifndef __WINDOWS__
+#ifndef _WIN32
     static const struct {
         const char *binary;
         const char *command;
@@ -331,7 +331,7 @@ sc_adb_reverse_remove(struct sc_intr *intr, const char *serial,
 bool
 sc_adb_push(struct sc_intr *intr, const char *serial, const char *local,
             const char *remote, unsigned flags) {
-#ifdef __WINDOWS__
+#ifdef _WIN32
     // Windows will parse the string, so the paths must be quoted
     // (see sys/win/command.c)
     local = sc_str_quote(local);
@@ -351,7 +351,7 @@ sc_adb_push(struct sc_intr *intr, const char *serial, const char *local,
 
     sc_pid pid = sc_adb_execute(argv, flags);
 
-#ifdef __WINDOWS__
+#ifdef _WIN32
     free((void *) remote);
     free((void *) local);
 #endif
@@ -362,7 +362,7 @@ sc_adb_push(struct sc_intr *intr, const char *serial, const char *local,
 bool
 sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,
                unsigned flags) {
-#ifdef __WINDOWS__
+#ifdef _WIN32
     // Windows will parse the string, so the local name must be quoted
     // (see sys/win/command.c)
     local = sc_str_quote(local);
@@ -377,7 +377,7 @@ sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,
 
     sc_pid pid = sc_adb_execute(argv, flags);
 
-#ifdef __WINDOWS__
+#ifdef _WIN32
     free((void *) local);
 #endif
 

app/src/main.c

@@ -1,6 +1,7 @@
 #include "common.h"
 
 #include <stdbool.h>
+#include <stdio.h>
 #ifdef HAVE_V4L2
 # include <libavdevice/avdevice.h>
 #endif

app/src/screen.c

@@ -225,7 +225,7 @@ sc_screen_render_novideo(struct sc_screen *screen) {
     (void) res; // any error already logged
 }
 
-#if defined(__APPLE__) || defined(__WINDOWS__)
+#if defined(__APPLE__) || defined(_WIN32)
 # define CONTINUOUS_RESIZING_WORKAROUND
 #endif
 
@@ -409,7 +409,7 @@ sc_screen_init(struct sc_screen *screen,
     } else {
         // without video, the icon is used as window content, it must be present
         LOGE("Could not load icon");
-        goto error_destroy_fps_counter;
+        goto error_destroy_window;
     }
 
     SDL_Surface *icon_novideo = params->video ? NULL : icon;

app/src/util/net.c

@@ -2,6 +2,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #ifdef _WIN32
 # include <ws2tcpip.h>

app/src/util/vecdeque.h

@@ -191,7 +191,8 @@ sc_vecdeque_reallocdata_(void *ptr, size_t newcap, size_t item_size,
 
     size_t right_len = MIN(size, oldcap - oldorigin);
     assert(right_len);
-    memcpy(newptr, (char *) ptr + (oldorigin * item_size), right_len * item_size);
+    memcpy(newptr, (char *) ptr + (oldorigin * item_size),
+           right_len * item_size);
 
     if (size > right_len) {
         memcpy((char *) newptr + (right_len * item_size), ptr,

server/src/main/java/com/genymobile/scrcpy/util/Settings.java

@@ -1,13 +1,8 @@
 package com.genymobile.scrcpy.util;
 
-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.wrappers.ContentProvider;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
-import android.os.Build;
-
-import java.io.IOException;
-
 public final class Settings {
 
     public static final String TABLE_SYSTEM = ContentProvider.TABLE_SYSTEM;
@@ -18,66 +13,26 @@ public final class Settings {
         /* not instantiable */
     }
 
-    private static void execSettingsPut(String table, String key, String value) throws SettingsException {
-        try {
-            Command.exec("settings", "put", table, key, value);
-        } catch (IOException | InterruptedException e) {
-            throw new SettingsException("put", table, key, value, e);
-        }
-    }
-
-    private static String execSettingsGet(String table, String key) throws SettingsException {
-        try {
-            return Command.execReadLine("settings", "get", table, key);
-        } catch (IOException | InterruptedException e) {
-            throw new SettingsException("get", table, key, null, e);
-        }
-    }
-
     public static String getValue(String table, String key) throws SettingsException {
-        if (Build.VERSION.SDK_INT <= AndroidVersions.API_30_ANDROID_11) {
-            // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
-                return provider.getValue(table, key);
-            } catch (SettingsException e) {
-                Ln.w("Could not get settings value via ContentProvider, fallback to settings process", e);
-            }
+        try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            return provider.getValue(table, key);
         }
-
-        return execSettingsGet(table, key);
     }
 
     public static void putValue(String table, String key, String value) throws SettingsException {
-        if (Build.VERSION.SDK_INT <= AndroidVersions.API_30_ANDROID_11) {
-            // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
-                provider.putValue(table, key, value);
-            } catch (SettingsException e) {
-                Ln.w("Could not put settings value via ContentProvider, fallback to settings process", e);
-            }
+        try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            provider.putValue(table, key, value);
         }
 
-        execSettingsPut(table, key, value);
     }
 
     public static String getAndPutValue(String table, String key, String value) throws SettingsException {
-        if (Build.VERSION.SDK_INT <= AndroidVersions.API_30_ANDROID_11) {
-            // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
-                String oldValue = provider.getValue(table, key);
-                if (!value.equals(oldValue)) {
-                    provider.putValue(table, key, value);
-                }
-                return oldValue;
-            } catch (SettingsException e) {
-                Ln.w("Could not get and put settings value via ContentProvider, fallback to settings process", e);
+        try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            String oldValue = provider.getValue(table, key);
+            if (!value.equals(oldValue)) {
+                provider.putValue(table, key, value);
             }
+            return oldValue;
         }
-
-        String oldValue = getValue(table, key);
-        if (!value.equals(oldValue)) {
-            putValue(table, key, value);
-        }
-        return oldValue;
     }
 }