Add scrcpy-console.desktop

Add a launcher which opens a terminal, and keep it open in case of
errors (so that the user has time to read error messages).

The behavior is the same as scrcpy-console.bat on Windows.

PR #3351 <https://github.com/Genymobile/scrcpy/pull/3351>

README.md

@@ -395,8 +395,8 @@ address), connect the device over USB, then run:
 scrcpy --tcpip    # without arguments
 ```
 
-It will automatically find the device IP address and adb port, enable TCP/IP
-mode if necessary, then connect to the device before starting.
+It will automatically find the device IP address, enable TCP/IP mode, then
+connect to the device before starting.
 
 ##### Manual
 

app/data/bash-completion/scrcpy

@@ -93,11 +93,6 @@ _scrcpy() {
             COMPREPLY=($(compgen -W 'verbose debug info warn error' -- "$cur"))
             return
             ;;
-        -s|--serial)
-            # Use 'adb devices' to list serial numbers
-            COMPREPLY=($(compgen -W "$("${ADB:-adb}" devices | awk '$2 == "device" {print $1}')" -- ${cur}))
-            return
-            ;;
         -b|--bitrate \
         |--codec-options \
         |--crop \
@@ -108,6 +103,7 @@ _scrcpy() {
         |-m|--max-size \
         |-p|--port \
         |--push-target \
+        |-s|--serial \
         |--tunnel-host \
         |--tunnel-port \
         |--v4l2-buffer \

app/data/zsh-completion/_scrcpy

@@ -47,7 +47,7 @@ arguments=(
     '--record-format=[Force recording format]:format:(mp4 mkv)'
     '--render-driver=[Request SDL to use the given render driver]:driver name:(direct3d opengl opengles2 opengles metal software)'
     '--rotation=[Set the initial display rotation]:rotation values:(0 1 2 3)'
-    {-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
+    {-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]'
     '--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
     {-S,--turn-screen-off}'[Turn the device screen off immediately]'
     {-t,--show-touches}'[Show physical touches]'

app/meson.build

@@ -23,7 +23,6 @@ src = [
     'src/options.c',
     'src/receiver.c',
     'src/recorder.c',
-    'src/rtp.c',
     'src/scrcpy.c',
     'src/screen.c',
     'src/server.c',
@@ -268,7 +267,6 @@ if get_option('buildtype') == 'debug'
             'tests/test_cli.c',
             'src/cli.c',
             'src/options.c',
-            'src/util/log.c',
             'src/util/net.c',
             'src/util/str.c',
             'src/util/strbuf.c',

app/scrcpy.1

@@ -275,7 +275,7 @@ Configure and reconnect the device over TCP/IP.
 
 If a destination address is provided, then scrcpy connects to this address before starting. The device must listen on the given TCP port (default is 5555).
 
-If no destination address is provided, then scrcpy attempts to find the IP address and adb port of the current device (typically connected over USB), enables TCP/IP mode if necessary, then connects to this address before starting.
+If no destination address is provided, then scrcpy attempts to find the IP address of the current device (typically connected over USB), enables TCP/IP mode, then connects to this address before starting.
 
 .TP
 .B \-S, \-\-turn\-screen\-off

app/src/control_msg.c

@@ -37,7 +37,7 @@ static const char *const android_motionevent_action_labels[] = {
     "move",
     "cancel",
     "outside",
-    "pointer-down",
+    "ponter-down",
     "pointer-up",
     "hover-move",
     "scroll",

app/src/demuxer.h

@@ -12,7 +12,7 @@
 #include "util/net.h"
 #include "util/thread.h"
 
-#define SC_DEMUXER_MAX_SINKS 3
+#define SC_DEMUXER_MAX_SINKS 2
 
 struct sc_demuxer {
     sc_socket socket;

app/src/main.c

@@ -4,10 +4,6 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <libavformat/avformat.h>
-#ifdef _WIN32
-#include <windows.h>
-#include "util/str.h"
-#endif
 #ifdef HAVE_V4L2
 # include <libavdevice/avdevice.h>
 #endif
@@ -22,8 +18,8 @@
 #include "version.h"
 
 int
-main_scrcpy(int argc, char *argv[]) {
-#ifdef _WIN32
+main(int argc, char *argv[]) {
+#ifdef __WINDOWS__
     // disable buffering, we want logs immediately
     // even line buffering (setvbuf() with mode _IOLBF) is not sufficient
     setbuf(stdout, NULL);
@@ -84,52 +80,3 @@ main_scrcpy(int argc, char *argv[]) {
 
     return ret;
 }
-
-int
-main(int argc, char *argv[]) {
-#ifndef _WIN32
-    return main_scrcpy(argc, argv);
-#else
-    (void) argc;
-    (void) argv;
-    int wargc;
-    wchar_t **wargv = CommandLineToArgvW(GetCommandLineW(), &wargc);
-    if (!wargv) {
-        LOG_OOM();
-        return SCRCPY_EXIT_FAILURE;
-    }
-
-    char **argv_utf8 = malloc((wargc + 1) * sizeof(*argv_utf8));
-    if (!argv_utf8) {
-        LOG_OOM();
-        LocalFree(wargv);
-        return SCRCPY_EXIT_FAILURE;
-    }
-
-    argv_utf8[wargc] = NULL;
-
-    for (int i = 0; i < wargc; ++i) {
-        argv_utf8[i] = sc_str_from_wchars(wargv[i]);
-        if (!argv_utf8[i]) {
-            LOG_OOM();
-            for (int j = 0; j < i; ++j) {
-                free(argv_utf8[j]);
-            }
-            LocalFree(wargv);
-            free(argv_utf8);
-            return SCRCPY_EXIT_FAILURE;
-        }
-    }
-
-    LocalFree(wargv);
-
-    int ret = main_scrcpy(wargc, argv_utf8);
-
-    for (int i = 0; i < wargc; ++i) {
-        free(argv_utf8[i]);
-    }
-    free(argv_utf8);
-
-    return ret;
-#endif
-}

app/src/rtp.c

@@ -1,319 +0,0 @@
-#include "rtp.h"
-
-#include <assert.h>
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/time.h>
-
-#include "util/log.h"
-
-/** Downcast packet_sink to rtp */
-#define DOWNCAST(SINK) container_of(SINK, struct sc_rtp, packet_sink)
-
-static const AVRational SCRCPY_TIME_BASE = {1, 1000000}; // timestamps in us
-
-static struct sc_rtp_packet *
-sc_rtp_packet_new(const AVPacket *packet) {
-    struct sc_rtp_packet *rtp = malloc(sizeof(*rtp));
-    if (!rtp) {
-        LOG_OOM();
-        return NULL;
-    }
-
-    rtp->packet = av_packet_alloc();
-    if (!rtp->packet) {
-        LOG_OOM();
-        free(rtp);
-        return NULL;
-    }
-
-    if (av_packet_ref(rtp->packet, packet)) {
-        av_packet_free(&rtp->packet);
-        free(rtp);
-        return NULL;
-    }
-
-    return rtp;
-}
-
-static void
-sc_rtp_packet_delete(struct sc_rtp_packet *rtp) {
-    av_packet_free(&rtp->packet);
-    free(rtp);
-}
-
-static void
-sc_rtp_queue_clear(struct sc_rtp_queue *queue) {
-    while (!sc_queue_is_empty(queue)) {
-        struct sc_rtp_packet *rtp;
-        sc_queue_take(queue, next, &rtp);
-        sc_rtp_packet_delete(rtp);
-    }
-}
-
-static bool
-sc_rtp_write_header(struct sc_rtp *rtp, const AVPacket *packet) {
-    AVStream *ostream = rtp->ctx->streams[0];
-
-    uint8_t *extradata = av_malloc(packet->size * sizeof(uint8_t));
-    if (!extradata) {
-        LOG_OOM();
-        return false;
-    }
-
-    // copy the first packet to the extra data
-    memcpy(extradata, packet->data, packet->size);
-
-    ostream->codecpar->extradata = extradata;
-    ostream->codecpar->extradata_size = packet->size;
-
-    int ret = avformat_write_header(rtp->ctx, NULL);
-    if (ret < 0) {
-        LOGE("Failed to write RTP header");
-        return false;
-    }
-
-    return true;
-}
-
-static void
-sc_rtp_rescale_packet(struct sc_rtp *rtp, AVPacket *packet) {
-    AVStream *ostream = rtp->ctx->streams[0];
-    av_packet_rescale_ts(packet, SCRCPY_TIME_BASE, ostream->time_base);
-}
-
-static bool
-sc_rtp_write(struct sc_rtp *rtp, AVPacket *packet) {
-    if (!rtp->header_written) {
-        if (packet->pts != AV_NOPTS_VALUE) {
-            LOGE("The first packet is not a config packet");
-            return false;
-        }
-        bool ok = sc_rtp_write_header(rtp, packet);
-        if (!ok) {
-            return false;
-        }
-        rtp->header_written = true;
-        return true;
-    }
-
-    if (packet->pts == AV_NOPTS_VALUE) {
-        // ignore config packets
-        return true;
-    }
-
-    sc_rtp_rescale_packet(rtp, packet);
-    return av_write_frame(rtp->ctx, packet) >= 0;
-}
-
-static int
-run_rtp(void *data) {
-    struct sc_rtp *rtp = data;
-
-    for (;;) {
-        sc_mutex_lock(&rtp->mutex);
-
-        while (!rtp->stopped && sc_queue_is_empty(&rtp->queue)) {
-            sc_cond_wait(&rtp->queue_cond, &rtp->mutex);
-        }
-
-        // if stopped is set, continue to process the remaining events (to
-        // finish the streaming) before actually stopping
-
-        if (rtp->stopped && sc_queue_is_empty(&rtp->queue)) {
-            sc_mutex_unlock(&rtp->mutex);
-            break;
-        }
-
-        struct sc_rtp_packet *pkt;
-        sc_queue_take(&rtp->queue, next, &pkt);
-
-        sc_mutex_unlock(&rtp->mutex);
-
-        bool ok = sc_rtp_write(rtp, pkt->packet);
-        sc_rtp_packet_delete(pkt);
-        if (!ok) {
-            LOGE("Could not send packet");
-
-            sc_mutex_lock(&rtp->mutex);
-            rtp->failed = true;
-            // discard pending packets
-            sc_rtp_queue_clear(&rtp->queue);
-            sc_mutex_unlock(&rtp->mutex);
-            break;
-        }
-    }
-
-    if (!rtp->failed) {
-        if (rtp->header_written) {
-            int ret = av_write_trailer(rtp->ctx);
-            if (ret < 0) {
-                LOGE("Failed to write RTP trailer");
-                rtp->failed = true;
-            }
-        } else {
-            // nothing has been sent
-            rtp->failed = true;
-        }
-    }
-
-    if (rtp->failed) {
-        LOGE("Streaming over RTP failed");
-    } else {
-        LOGI("Streaming over RTP complete");
-    }
-
-    LOGD("RTP streaming thread ended");
-
-    return 0;
-}
-
-static bool
-sc_rtp_open(struct sc_rtp *rtp, const AVCodec *input_codec) {
-    bool ok = sc_mutex_init(&rtp->mutex);
-    if (!ok) {
-        return false;
-    }
-
-    ok = sc_cond_init(&rtp->queue_cond);
-    if (!ok) {
-        goto error_mutex_destroy;
-    }
-
-    sc_queue_init(&rtp->queue);
-    rtp->stopped = false;
-    rtp->failed = false;
-    rtp->header_written = false;
-
-    int ret = avformat_alloc_output_context2(&rtp->ctx, NULL, "rtp",
-                                             rtp->out_url);
-    if (ret < 0) {
-        goto error_cond_destroy;
-    }
-
-    AVStream *ostream = avformat_new_stream(rtp->ctx, input_codec);
-    if (!ostream) {
-        goto error_avformat_free_context;
-    }
-
-    ostream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
-    ostream->codecpar->codec_id = input_codec->id;
-    ostream->codecpar->width = rtp->declared_frame_size.width;
-    ostream->codecpar->height = rtp->declared_frame_size.height;
-
-    ret = avio_open(&rtp->ctx->pb, rtp->out_url, AVIO_FLAG_WRITE);
-    if (ret < 0) {
-        LOGE("Failed to open output: %s", rtp->out_url);
-        // ostream will be cleaned up during context cleaning
-        goto error_avformat_free_context;
-    }
-
-    LOGD("Starting RTP thread");
-    ok = sc_thread_create(&rtp->thread, run_rtp, "scrcpy-rtp", rtp);
-    if (!ok) {
-        LOGE("Could not start RTP thread");
-        goto error_avio_close;
-    }
-
-    LOGI("Streaming started to %s", rtp->out_url);
-
-    return true;
-
-error_avio_close:
-    avio_close(rtp->ctx->pb);
-error_avformat_free_context:
-    avformat_free_context(rtp->ctx);
-error_cond_destroy:
-    sc_cond_destroy(&rtp->queue_cond);
-error_mutex_destroy:
-    sc_mutex_destroy(&rtp->mutex);
-
-    return false;
-}
-
-static void
-sc_rtp_close(struct sc_rtp *rtp) {
-    sc_mutex_lock(&rtp->mutex);
-    rtp->stopped = true;
-    sc_cond_signal(&rtp->queue_cond);
-    sc_mutex_unlock(&rtp->mutex);
-
-    sc_thread_join(&rtp->thread, NULL);
-
-    avio_close(rtp->ctx->pb);
-    avformat_free_context(rtp->ctx);
-    sc_cond_destroy(&rtp->queue_cond);
-    sc_mutex_destroy(&rtp->mutex);
-}
-
-static bool
-sc_rtp_push(struct sc_rtp *rtp, const AVPacket *packet) {
-    sc_mutex_lock(&rtp->mutex);
-    assert(!rtp->stopped);
-
-    if (rtp->failed) {
-        // reject any new packet (this will stop the stream)
-        sc_mutex_unlock(&rtp->mutex);
-        return false;
-    }
-
-    struct sc_rtp_packet *pkt = sc_rtp_packet_new(packet);
-    if (!pkt) {
-        LOG_OOM();
-        sc_mutex_unlock(&rtp->mutex);
-        return false;
-    }
-
-    sc_queue_push(&rtp->queue, next, pkt);
-    sc_cond_signal(&rtp->queue_cond);
-
-    sc_mutex_unlock(&rtp->mutex);
-    return true;
-}
-
-static bool
-sc_rtp_packet_sink_open(struct sc_packet_sink *sink,
-                        const AVCodec *codec) {
-    struct sc_rtp *rtp = DOWNCAST(sink);
-    return sc_rtp_open(rtp, codec);
-}
-
-static void
-sc_rtp_packet_sink_close(struct sc_packet_sink *sink) {
-    struct sc_rtp *rtp = DOWNCAST(sink);
-    sc_rtp_close(rtp);
-}
-
-static bool
-sc_rtp_packet_sink_push(struct sc_packet_sink *sink,
-                        const AVPacket *packet) {
-    struct sc_rtp *rtp = DOWNCAST(sink);
-    return sc_rtp_push(rtp, packet);
-}
-
-bool
-sc_rtp_init(struct sc_rtp *rtp, const char *out_url,
-            struct sc_size declared_frame_size) {
-    rtp->out_url = strdup(out_url);
-    if (!rtp->out_url) {
-        LOG_OOM();
-        return false;
-    }
-
-    rtp->declared_frame_size = declared_frame_size;
-
-    static const struct sc_packet_sink_ops ops = {
-        .open = sc_rtp_packet_sink_open,
-        .close = sc_rtp_packet_sink_close,
-        .push = sc_rtp_packet_sink_push,
-    };
-
-    rtp->packet_sink.ops = &ops;
-
-    return true;
-}
-
-void
-sc_rtp_destroy(struct sc_rtp *rtp) {
-    free(rtp->out_url);
-}

app/src/rtp.h

@@ -1,44 +0,0 @@
-#ifndef SC_RTP_H
-#define SC_RTP_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <libavformat/avformat.h>
-
-#include "coords.h"
-#include "trait/packet_sink.h"
-#include "util/queue.h"
-#include "util/thread.h"
-
-struct sc_rtp_packet {
-    AVPacket *packet;
-    struct sc_rtp_packet *next;
-};
-
-struct sc_rtp_queue SC_QUEUE(struct sc_rtp_packet);
-
-struct sc_rtp {
-    struct sc_packet_sink packet_sink; // packet sink trait;
-
-    char *out_url;
-    AVFormatContext *ctx;
-    struct sc_size declared_frame_size;
-    bool header_written;
-
-    sc_thread thread;
-    sc_mutex mutex;
-    sc_cond queue_cond;
-    bool stopped; // set on rtp_close()
-    bool failed; // set on packet write failure
-    struct sc_rtp_queue queue;
-};
-
-bool
-sc_rtp_init(struct sc_rtp *rtp, const char *out_url,
-            struct sc_size declared_frame_size);
-
-void
-sc_rtp_destroy(struct sc_rtp *rtp);
-
-#endif

app/src/scrcpy.c

@@ -21,7 +21,6 @@
 #include "keyboard_inject.h"
 #include "mouse_inject.h"
 #include "recorder.h"
-#include "rtp.h"
 #include "screen.h"
 #include "server.h"
 #ifdef HAVE_USB
@@ -43,7 +42,6 @@ struct scrcpy {
     struct sc_demuxer demuxer;
     struct sc_decoder decoder;
     struct sc_recorder recorder;
-    struct sc_rtp rtp;
 #ifdef HAVE_V4L2
     struct sc_v4l2_sink v4l2_sink;
 #endif
@@ -285,7 +283,6 @@ scrcpy(struct scrcpy_options *options) {
     bool server_started = false;
     bool file_pusher_initialized = false;
     bool recorder_initialized = false;
-    bool rtp_initialized = false;
 #ifdef HAVE_V4L2
     bool v4l2_sink_initialized = false;
 #endif
@@ -423,14 +420,6 @@ scrcpy(struct scrcpy_options *options) {
         sc_demuxer_add_sink(&s->demuxer, &rec->packet_sink);
     }
 
-    struct sc_rtp *rtp = NULL;
-    if (!sc_rtp_init(&s->rtp, "rtp://127.0.0.1:1234", info->frame_size)) {
-        goto end;
-    }
-    rtp = &s->rtp;
-    rtp_initialized = true;
-    sc_demuxer_add_sink(&s->demuxer, &rtp->packet_sink);
-
     struct sc_controller *controller = NULL;
     struct sc_key_processor *kp = NULL;
     struct sc_mouse_processor *mp = NULL;
@@ -718,10 +707,6 @@ end:
         sc_controller_destroy(&s->controller);
     }
 
-    if (rtp_initialized) {
-        sc_rtp_destroy(&s->rtp);
-    }
-
     if (recorder_initialized) {
         sc_recorder_destroy(&s->recorder);
     }

app/src/server.c

@@ -19,8 +19,6 @@
 #define SC_SERVER_PATH_DEFAULT PREFIX "/share/scrcpy/" SC_SERVER_FILENAME
 #define SC_DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"
 
-#define SC_ADB_PORT_DEFAULT 5555
-
 static char *
 get_server_path(void) {
 #ifdef __WINDOWS__
@@ -515,36 +513,27 @@ sc_server_on_terminated(void *userdata) {
     LOGD("Server terminated");
 }
 
-static uint16_t
-get_adb_tcp_port(struct sc_server *server, const char *serial) {
+static bool
+is_tcpip_mode_enabled(struct sc_server *server, const char *serial) {
     struct sc_intr *intr = &server->intr;
 
     char *current_port =
         sc_adb_getprop(intr, serial, "service.adb.tcp.port", SC_ADB_SILENT);
     if (!current_port) {
-        return 0;
+        return false;
     }
 
-    long value;
-    bool ok = sc_str_parse_integer(current_port, &value);
+    // Is the device is listening on TCP on port 5555?
+    bool enabled = !strcmp("5555", current_port);
     free(current_port);
-    if (!ok) {
-        return 0;
-    }
-
-    if (value < 0 || value > 0xFFFF) {
-        return 0;
-    }
-
-    return value;
+    return enabled;
 }
 
 static bool
 wait_tcpip_mode_enabled(struct sc_server *server, const char *serial,
-                        uint16_t expected_port, unsigned attempts,
-                        sc_tick delay) {
-    uint16_t adb_port = get_adb_tcp_port(server, serial);
-    if (adb_port == expected_port) {
+                        unsigned attempts, sc_tick delay) {
+    if (is_tcpip_mode_enabled(server, serial)) {
+        LOGI("TCP/IP mode enabled");
         return true;
     }
 
@@ -558,23 +547,28 @@ wait_tcpip_mode_enabled(struct sc_server *server, const char *serial,
             return false;
         }
 
-        adb_port = get_adb_tcp_port(server, serial);
-        if (adb_port == expected_port) {
+        if (is_tcpip_mode_enabled(server, serial)) {
+            LOGI("TCP/IP mode enabled");
             return true;
         }
     } while (--attempts);
     return false;
 }
 
-static char *
-append_port(const char *ip, uint16_t port) {
-    char *ip_port;
-    int ret = asprintf(&ip_port, "%s:%" PRIu16, ip, port);
-    if (ret == -1) {
+char *
+append_port_5555(const char *ip) {
+    size_t len = strlen(ip);
+
+    // sizeof counts the final '\0'
+    char *ip_port = malloc(len + sizeof(":5555"));
+    if (!ip_port) {
         LOG_OOM();
         return NULL;
     }
 
+    memcpy(ip_port, ip, len);
+    memcpy(ip_port + len, ":5555", sizeof(":5555"));
+
     return ip_port;
 }
 
@@ -592,36 +586,34 @@ sc_server_switch_to_tcpip(struct sc_server *server, const char *serial) {
         return NULL;
     }
 
-    uint16_t adb_port = get_adb_tcp_port(server, serial);
-    if (adb_port) {
-        LOGI("TCP/IP mode already enabled on port %" PRIu16, adb_port);
-    } else {
-        LOGI("Enabling TCP/IP mode on port " SC_STR(SC_ADB_PORT_DEFAULT) "...");
+    char *ip_port = append_port_5555(ip);
+    free(ip);
+    if (!ip_port) {
+        return NULL;
+    }
 
-        bool ok = sc_adb_tcpip(intr, serial, SC_ADB_PORT_DEFAULT,
-                               SC_ADB_NO_STDOUT);
+    bool tcp_mode = is_tcpip_mode_enabled(server, serial);
+
+    if (!tcp_mode) {
+        bool ok = sc_adb_tcpip(intr, serial, 5555, SC_ADB_NO_STDOUT);
         if (!ok) {
             LOGE("Could not restart adbd in TCP/IP mode");
-            free(ip);
-            return NULL;
+            goto error;
         }
 
         unsigned attempts = 40;
         sc_tick delay = SC_TICK_FROM_MS(250);
-        ok = wait_tcpip_mode_enabled(server, serial, SC_ADB_PORT_DEFAULT,
-                                     attempts, delay);
+        ok = wait_tcpip_mode_enabled(server, serial, attempts, delay);
         if (!ok) {
-            free(ip);
-            return NULL;
+            goto error;
         }
-
-        adb_port = SC_ADB_PORT_DEFAULT;
-        LOGI("TCP/IP mode enabled on port " SC_STR(SC_ADB_PORT_DEFAULT));
     }
 
-    char *ip_port = append_port(ip, adb_port);
-    free(ip);
     return ip_port;
+
+error:
+    free(ip_port);
+    return NULL;
 }
 
 static bool
@@ -648,8 +640,7 @@ sc_server_configure_tcpip_known_address(struct sc_server *server,
                                         const char *addr) {
     // Append ":5555" if no port is present
     bool contains_port = strchr(addr, ':');
-    char *ip_port = contains_port ? strdup(addr)
-                                  : append_port(addr, SC_ADB_PORT_DEFAULT);
+    char *ip_port = contains_port ? strdup(addr) : append_port_5555(addr);
     if (!ip_port) {
         LOG_OOM();
         return false;

app/src/sys/unix/process.c

@@ -92,14 +92,8 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
                 close(in[0]);
             }
             close(in[1]);
-        } else {
-            int devnull = open("/dev/null", O_RDONLY | O_CREAT, 0666);
-            if (devnull != -1) {
-                dup2(devnull, STDIN_FILENO);
-            } else {
-                LOGE("Could not open /dev/null for stdin");
-            }
         }
+        // Do not close stdin in the child process, this makes adb fail on Linux
 
         if (pout) {
             if (out[1] != STDOUT_FILENO) {
@@ -108,12 +102,8 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
             }
             close(out[0]);
         } else if (!inherit_stdout) {
-            int devnull = open("/dev/null", O_WRONLY | O_CREAT, 0666);
-            if (devnull != -1) {
-                dup2(devnull, STDOUT_FILENO);
-            } else {
-                LOGE("Could not open /dev/null for stdout");
-            }
+            // Close stdout in the child process
+            close(STDOUT_FILENO);
         }
 
         if (perr) {
@@ -123,12 +113,8 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
             }
             close(err[0]);
         } else if (!inherit_stderr) {
-            int devnull = open("/dev/null", O_WRONLY | O_CREAT, 0666);
-            if (devnull != -1) {
-                dup2(devnull, STDERR_FILENO);
-            } else {
-                LOGE("Could not open /dev/null for stderr");
-            }
+            // Close stderr in the child process
+            close(STDERR_FILENO);
         }
 
         close(internal[0]);

app/src/util/str.h

@@ -6,10 +6,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-/* Stringify a numeric value  */
-#define SC_STR(s) SC_XSTR(s)
-#define SC_XSTR(s) #s
-
 /**
  * Like strncpy(), except:
  *  - it copies at most n-1 chars

app/src/util/thread.c

@@ -1,7 +1,6 @@
 #include "thread.h"
 
 #include <assert.h>
-#include <string.h>
 #include <SDL2/SDL_thread.h>
 
 #include "log.h"

app/src/util/vector.h

@@ -6,7 +6,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 
 // Adapted from vlc_vector:
 // <https://code.videolan.org/videolan/vlc/-/blob/0857947abaed9c89810cd96353aaa1b7e6ba3b0d/include/vlc_vector.h>

build.gradle

@@ -4,10 +4,10 @@ buildscript {
 
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:deprecation"

cross_win32.txt

@@ -22,4 +22,4 @@ ffmpeg_avutil = 'avutil-56'
 prebuilt_ffmpeg = 'ffmpeg-win32-4.3.1'
 prebuilt_sdl2 = 'SDL2-2.0.22/i686-w64-mingw32'
 prebuilt_libusb_root = 'libusb-1.0.26'
-prebuilt_libusb = 'libusb-1.0.26/MinGW-Win32'
+prebuilt_libusb = prebuilt_libusb_root + '/MinGW-Win32'

cross_win64.txt

@@ -22,4 +22,4 @@ ffmpeg_avutil = 'avutil-57'
 prebuilt_ffmpeg = 'ffmpeg-win64-5.0.1'
 prebuilt_sdl2 = 'SDL2-2.0.22/x86_64-w64-mingw32'
 prebuilt_libusb_root = 'libusb-1.0.26'
-prebuilt_libusb = 'libusb-1.0.26/MinGW-x64'
+prebuilt_libusb = prebuilt_libusb_root + '/MinGW-x64'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

server/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 31
         versionCode 12400
         versionName "1.24"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

server/build_without_gradle.sh

@@ -14,9 +14,8 @@ set -e
 SCRCPY_DEBUG=false
 SCRCPY_VERSION_NAME=1.24
 
-PLATFORM=${ANDROID_PLATFORM:-33}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-33.0.0}
-BUILD_TOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOLS"
+PLATFORM=${ANDROID_PLATFORM:-31}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-31.0.0}
 
 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
 CLASSES_DIR="$BUILD_DIR/classes"
@@ -42,8 +41,9 @@ EOF
 
 echo "Generating java from aidl..."
 cd "$SERVER_DIR/src/main/aidl"
-"$BUILD_TOOLS_DIR/aidl" -o"$CLASSES_DIR" android/view/IRotationWatcher.aidl
-"$BUILD_TOOLS_DIR/aidl" -o"$CLASSES_DIR" \
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
+    android/view/IRotationWatcher.aidl
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
     android/content/IOnPrimaryClipChangedListener.aidl
 
 echo "Compiling java sources..."
@@ -59,7 +59,8 @@ cd "$CLASSES_DIR"
 if [[ $PLATFORM -lt 31 ]]
 then
     # use dx
-    "$BUILD_TOOLS_DIR/dx" --dex --output "$BUILD_DIR/classes.dex" \
+    "$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
+        --output "$BUILD_DIR/classes.dex" \
         android/view/*.class \
         android/content/*.class \
         com/genymobile/scrcpy/*.class \
@@ -71,7 +72,7 @@ then
     rm -rf classes.dex classes
 else
     # use d8
-    "$BUILD_TOOLS_DIR/d8" --classpath "$ANDROID_JAR" \
+    "$ANDROID_HOME/build-tools/$BUILD_TOOLS/d8" --classpath "$ANDROID_JAR" \
         --output "$BUILD_DIR/classes.zip" \
         android/view/*.class \
         android/content/*.class \

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

@@ -1,5 +1,7 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.wrappers.ServiceManager;
+
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Base64;
@@ -162,10 +164,12 @@ public final class CleanUp {
         Config config = Config.fromBase64(args[0]);
 
         if (config.disableShowTouches || config.restoreStayOn != -1) {
+            ServiceManager serviceManager = new ServiceManager();
+            Settings settings = new Settings(serviceManager);
             if (config.disableShowTouches) {
                 Ln.i("Disabling \"show touches\"");
                 try {
-                    Settings.putValue(Settings.TABLE_SYSTEM, "show_touches", "0");
+                    settings.putValue(Settings.TABLE_SYSTEM, "show_touches", "0");
                 } catch (SettingsException e) {
                     Ln.e("Could not restore \"show_touches\"", e);
                 }
@@ -173,7 +177,7 @@ public final class CleanUp {
             if (config.restoreStayOn != -1) {
                 Ln.i("Restoring \"stay awake\"");
                 try {
-                    Settings.putValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(config.restoreStayOn));
+                    settings.putValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(config.restoreStayOn));
                 } catch (SettingsException e) {
                     Ln.e("Could not restore \"stay_on_while_plugged_in\"", e);
                 }

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

@@ -30,14 +30,4 @@ public final class Command {
         }
         return result;
     }
-
-    public static String execReadOutput(String... cmd) throws IOException, InterruptedException {
-        Process process = Runtime.getRuntime().exec(cmd);
-        String output = IO.toString(process.getInputStream());
-        int exitCode = process.waitFor();
-        if (exitCode != 0) {
-            throw new IOException("Command " + Arrays.toString(cmd) + " returned with value " + exitCode);
-        }
-        return output;
-    }
 }

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

@@ -31,6 +31,9 @@ public final class Device {
     public static final int LOCK_VIDEO_ORIENTATION_UNLOCKED = -1;
     public static final int LOCK_VIDEO_ORIENTATION_INITIAL = -2;
 
+    private static final ServiceManager SERVICE_MANAGER = new ServiceManager();
+    private static final Settings SETTINGS = new Settings(SERVICE_MANAGER);
+
     public interface RotationListener {
         void onRotationChanged(int rotation);
     }
@@ -63,9 +66,9 @@ public final class Device {
 
     public Device(Options options) {
         displayId = options.getDisplayId();
-        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
+        DisplayInfo displayInfo = SERVICE_MANAGER.getDisplayManager().getDisplayInfo(displayId);
         if (displayInfo == null) {
-            int[] displayIds = ServiceManager.getDisplayManager().getDisplayIds();
+            int[] displayIds = SERVICE_MANAGER.getDisplayManager().getDisplayIds();
             throw new InvalidDisplayIdException(displayId, displayIds);
         }
 
@@ -79,7 +82,7 @@ public final class Device {
         screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
         layerStack = displayInfo.getLayerStack();
 
-        ServiceManager.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
+        SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
             @Override
             public void onRotationChanged(int rotation) {
                 synchronized (Device.this) {
@@ -95,7 +98,7 @@ public final class Device {
 
         if (options.getControl() && options.getClipboardAutosync()) {
             // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
-            ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
+            ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
             if (clipboardManager != null) {
                 clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
                     @Override
@@ -189,7 +192,7 @@ public final class Device {
             return false;
         }
 
-        return ServiceManager.getInputManager().injectInputEvent(inputEvent, injectMode);
+        return SERVICE_MANAGER.getInputManager().injectInputEvent(inputEvent, injectMode);
     }
 
     public boolean injectEvent(InputEvent event, int injectMode) {
@@ -217,7 +220,7 @@ public final class Device {
     }
 
     public static boolean isScreenOn() {
-        return ServiceManager.getPowerManager().isScreenOn();
+        return SERVICE_MANAGER.getPowerManager().isScreenOn();
     }
 
     public synchronized void setRotationListener(RotationListener rotationListener) {
@@ -229,19 +232,19 @@ public final class Device {
     }
 
     public static void expandNotificationPanel() {
-        ServiceManager.getStatusBarManager().expandNotificationsPanel();
+        SERVICE_MANAGER.getStatusBarManager().expandNotificationsPanel();
     }
 
     public static void expandSettingsPanel() {
-        ServiceManager.getStatusBarManager().expandSettingsPanel();
+        SERVICE_MANAGER.getStatusBarManager().expandSettingsPanel();
     }
 
     public static void collapsePanels() {
-        ServiceManager.getStatusBarManager().collapsePanels();
+        SERVICE_MANAGER.getStatusBarManager().collapsePanels();
     }
 
     public static String getClipboardText() {
-        ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
+        ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
         if (clipboardManager == null) {
             return null;
         }
@@ -253,7 +256,7 @@ public final class Device {
     }
 
     public boolean setClipboardText(String text) {
-        ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
+        ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
         if (clipboardManager == null) {
             return false;
         }
@@ -296,7 +299,7 @@ public final class Device {
      * Disable auto-rotation (if enabled), set the screen rotation and re-enable auto-rotation (if it was enabled).
      */
     public static void rotateDevice() {
-        WindowManager wm = ServiceManager.getWindowManager();
+        WindowManager wm = SERVICE_MANAGER.getWindowManager();
 
         boolean accelerometerRotation = !wm.isRotationFrozen();
 
@@ -312,4 +315,8 @@ public final class Device {
             wm.thawRotation();
         }
     }
+
+    public static Settings getSettings() {
+        return SETTINGS;
+    }
 }

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

@@ -6,9 +6,7 @@ import android.system.OsConstants;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.util.Scanner;
 
 public final class IO {
     private IO() {
@@ -39,13 +37,4 @@ public final class IO {
     public static void writeFully(FileDescriptor fd, byte[] buffer, int offset, int len) throws IOException {
         writeFully(fd, ByteBuffer.wrap(buffer, offset, len));
     }
-
-    public static String toString(InputStream inputStream) {
-        StringBuilder builder = new StringBuilder();
-        Scanner scanner = new Scanner(inputStream);
-        while (scanner.hasNextLine()) {
-            builder.append(scanner.nextLine()).append('\n');
-        }
-        return builder.toString();
-    }
 }

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

@@ -20,9 +20,10 @@ public final class Server {
         int restoreStayOn = -1;
         boolean restoreNormalPowerMode = options.getControl(); // only restore power mode if control is enabled
         if (options.getShowTouches() || options.getStayAwake()) {
+            Settings settings = Device.getSettings();
             if (options.getShowTouches()) {
                 try {
-                    String oldValue = Settings.getAndPutValue(Settings.TABLE_SYSTEM, "show_touches", "1");
+                    String oldValue = settings.getAndPutValue(Settings.TABLE_SYSTEM, "show_touches", "1");
                     // If "show touches" was disabled, it must be disabled back on clean up
                     mustDisableShowTouchesOnCleanUp = !"1".equals(oldValue);
                 } catch (SettingsException e) {
@@ -33,7 +34,7 @@ public final class Server {
             if (options.getStayAwake()) {
                 int stayOn = BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
                 try {
-                    String oldValue = Settings.getAndPutValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
+                    String oldValue = settings.getAndPutValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
                     try {
                         restoreStayOn = Integer.parseInt(oldValue);
                         if (restoreStayOn == stayOn) {

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

@@ -7,14 +7,16 @@ import android.os.Build;
 
 import java.io.IOException;
 
-public final class Settings {
+public class Settings {
 
     public static final String TABLE_SYSTEM = ContentProvider.TABLE_SYSTEM;
     public static final String TABLE_SECURE = ContentProvider.TABLE_SECURE;
     public static final String TABLE_GLOBAL = ContentProvider.TABLE_GLOBAL;
 
-    private Settings() {
-        /* not instantiable */
+    private final ServiceManager serviceManager;
+
+    public Settings(ServiceManager serviceManager) {
+        this.serviceManager = serviceManager;
     }
 
     private static void execSettingsPut(String table, String key, String value) throws SettingsException {
@@ -33,10 +35,10 @@ public final class Settings {
         }
     }
 
-    public static String getValue(String table, String key) throws SettingsException {
+    public String getValue(String table, String key) throws SettingsException {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
             // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            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);
@@ -46,10 +48,10 @@ public final class Settings {
         return execSettingsGet(table, key);
     }
 
-    public static void putValue(String table, String key, String value) throws SettingsException {
+    public void putValue(String table, String key, String value) throws SettingsException {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
             // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            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);
@@ -59,10 +61,10 @@ public final class Settings {
         execSettingsPut(table, key, value);
     }
 
-    public static String getAndPutValue(String table, String key, String value) throws SettingsException {
+    public String getAndPutValue(String table, String key, String value) throws SettingsException {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
             // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            try (ContentProvider provider = serviceManager.getActivityManager().createSettingsProvider()) {
                 String oldValue = provider.getValue(table, key);
                 if (!value.equals(oldValue)) {
                     provider.putValue(table, key, value);

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

@@ -15,9 +15,6 @@ public class ClipboardManager {
     private Method getPrimaryClipMethod;
     private Method setPrimaryClipMethod;
     private Method addPrimaryClipChangedListener;
-    private boolean alternativeGetMethod;
-    private boolean alternativeSetMethod;
-    private boolean alternativeAddListenerMethod;
 
     public ClipboardManager(IInterface manager) {
         this.manager = manager;
@@ -28,12 +25,7 @@ public class ClipboardManager {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                 getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);
             } else {
-                try {
-                    getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);
-                } catch (NoSuchMethodException e) {
-                    getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class);
-                    alternativeGetMethod = true;
-                }
+                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);
             }
         }
         return getPrimaryClipMethod;
@@ -44,34 +36,23 @@ public class ClipboardManager {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                 setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);
             } else {
-                try {
-                    setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, int.class);
-                } catch (NoSuchMethodException e) {
-                    setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class);
-                    alternativeSetMethod = true;
-                }
+                setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, int.class);
             }
         }
         return setPrimaryClipMethod;
     }
 
-    private static ClipData getPrimaryClip(Method method, boolean alternativeMethod, IInterface manager)
-            throws InvocationTargetException, IllegalAccessException {
+    private static ClipData getPrimaryClip(Method method, IInterface manager) throws InvocationTargetException, IllegalAccessException {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME);
         }
-        if (alternativeMethod) {
-            return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);
-        }
         return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
     }
 
-    private static void setPrimaryClip(Method method, boolean alternativeMethod, IInterface manager, ClipData clipData)
+    private static void setPrimaryClip(Method method, IInterface manager, ClipData clipData)
             throws InvocationTargetException, IllegalAccessException {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME);
-        } else if (alternativeMethod) {
-            method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);
         } else {
             method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
         }
@@ -80,7 +61,7 @@ public class ClipboardManager {
     public CharSequence getText() {
         try {
             Method method = getGetPrimaryClipMethod();
-            ClipData clipData = getPrimaryClip(method, alternativeGetMethod, manager);
+            ClipData clipData = getPrimaryClip(method, manager);
             if (clipData == null || clipData.getItemCount() == 0) {
                 return null;
             }
@@ -95,7 +76,7 @@ public class ClipboardManager {
         try {
             Method method = getSetPrimaryClipMethod();
             ClipData clipData = ClipData.newPlainText(null, text);
-            setPrimaryClip(method, alternativeSetMethod, manager, clipData);
+            setPrimaryClip(method, manager, clipData);
             return true;
         } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
             Ln.e("Could not invoke method", e);
@@ -103,14 +84,13 @@ public class ClipboardManager {
         }
     }
 
-    private static void addPrimaryClipChangedListener(Method method, boolean alternativeMethod, IInterface manager,
-            IOnPrimaryClipChangedListener listener) throws InvocationTargetException, IllegalAccessException {
+    private static void addPrimaryClipChangedListener(Method method, IInterface manager, IOnPrimaryClipChangedListener listener)
+            throws InvocationTargetException, IllegalAccessException {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             method.invoke(manager, listener, ServiceManager.PACKAGE_NAME);
-        } else if (alternativeMethod) {
-            method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);
-        } else
+        } else {
             method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
+        }
     }
 
     private Method getAddPrimaryClipChangedListener() throws NoSuchMethodException {
@@ -119,14 +99,8 @@ public class ClipboardManager {
                 addPrimaryClipChangedListener = manager.getClass()
                         .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class);
             } else {
-                try {
-                    addPrimaryClipChangedListener = manager.getClass()
-                            .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class, int.class);
-                } catch (NoSuchMethodException e) {
-                    addPrimaryClipChangedListener = manager.getClass()
-                            .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class, String.class, int.class);
-                    alternativeAddListenerMethod = true;
-                }
+                addPrimaryClipChangedListener = manager.getClass()
+                        .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class, int.class);
             }
         }
         return addPrimaryClipChangedListener;
@@ -135,7 +109,7 @@ public class ClipboardManager {
     public boolean addPrimaryClipChangedListener(IOnPrimaryClipChangedListener listener) {
         try {
             Method method = getAddPrimaryClipChangedListener();
-            addPrimaryClipChangedListener(method, alternativeAddListenerMethod, manager, listener);
+            addPrimaryClipChangedListener(method, manager, listener);
             return true;
         } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
             Ln.e("Could not invoke method", e);

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

@@ -1,16 +1,8 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Command;
 import com.genymobile.scrcpy.DisplayInfo;
-import com.genymobile.scrcpy.Ln;
 import com.genymobile.scrcpy.Size;
 
-import android.view.Display;
-
-import java.lang.reflect.Field;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public final class DisplayManager {
     private final Object manager; // instance of hidden class android.hardware.display.DisplayManagerGlobal
 
@@ -18,61 +10,11 @@ public final class DisplayManager {
         this.manager = manager;
     }
 
-    // public to call it from unit tests
-    public static DisplayInfo parseDisplayInfo(String dumpsysDisplayOutput, int displayId) {
-        Pattern regex = Pattern.compile(
-                "^    mOverrideDisplayInfo=DisplayInfo\\{\".*?, displayId " + displayId + ".*?(, FLAG_.*)?, real ([0-9]+) x ([0-9]+).*?, "
-                        + "rotation ([0-9]+).*?, layerStack ([0-9]+)",
-                Pattern.MULTILINE);
-        Matcher m = regex.matcher(dumpsysDisplayOutput);
-        if (!m.find()) {
-            return null;
-        }
-        int flags = parseDisplayFlags(m.group(1));
-        int width = Integer.parseInt(m.group(2));
-        int height = Integer.parseInt(m.group(3));
-        int rotation = Integer.parseInt(m.group(4));
-        int layerStack = Integer.parseInt(m.group(5));
-
-        return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
-    }
-
-    private static DisplayInfo getDisplayInfoFromDumpsysDisplay(int displayId) {
-        try {
-            String dumpsysDisplayOutput = Command.execReadOutput("dumpsys", "display");
-            return parseDisplayInfo(dumpsysDisplayOutput, displayId);
-        } catch (Exception e) {
-            Ln.e("Could not get display info from \"dumpsys display\" output", e);
-            return null;
-        }
-    }
-
-    private static int parseDisplayFlags(String text) {
-        Pattern regex = Pattern.compile("FLAG_[A-Z_]+");
-        if (text == null) {
-            return 0;
-        }
-
-        int flags = 0;
-        Matcher m = regex.matcher(text);
-        while (m.find()) {
-            String flagString = m.group();
-            try {
-                Field filed = Display.class.getDeclaredField(flagString);
-                flags |= filed.getInt(null);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                // Silently ignore, some flags reported by "dumpsys display" are @TestApi
-            }
-        }
-        return flags;
-    }
-
     public DisplayInfo getDisplayInfo(int displayId) {
         try {
             Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, displayId);
             if (displayInfo == null) {
-                // fallback when displayInfo is null
-                return getDisplayInfoFromDumpsysDisplay(displayId);
+                return null;
             }
             Class<?> cls = displayInfo.getClass();
             // width and height already take the rotation into account

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

@@ -13,30 +13,27 @@ public final class ServiceManager {
     public static final String PACKAGE_NAME = "com.android.shell";
     public static final int USER_ID = 0;
 
-    private static final Method GET_SERVICE_METHOD;
-    static {
+    private final Method getServiceMethod;
+
+    private WindowManager windowManager;
+    private DisplayManager displayManager;
+    private InputManager inputManager;
+    private PowerManager powerManager;
+    private StatusBarManager statusBarManager;
+    private ClipboardManager clipboardManager;
+    private ActivityManager activityManager;
+
+    public ServiceManager() {
         try {
-            GET_SERVICE_METHOD = Class.forName("android.os.ServiceManager").getDeclaredMethod("getService", String.class);
+            getServiceMethod = Class.forName("android.os.ServiceManager").getDeclaredMethod("getService", String.class);
         } catch (Exception e) {
             throw new AssertionError(e);
         }
     }
 
-    private static WindowManager windowManager;
-    private static DisplayManager displayManager;
-    private static InputManager inputManager;
-    private static PowerManager powerManager;
-    private static StatusBarManager statusBarManager;
-    private static ClipboardManager clipboardManager;
-    private static ActivityManager activityManager;
-
-    private ServiceManager() {
-        /* not instantiable */
-    }
-
-    private static IInterface getService(String service, String type) {
+    private IInterface getService(String service, String type) {
         try {
-            IBinder binder = (IBinder) GET_SERVICE_METHOD.invoke(null, service);
+            IBinder binder = (IBinder) getServiceMethod.invoke(null, service);
             Method asInterfaceMethod = Class.forName(type + "$Stub").getMethod("asInterface", IBinder.class);
             return (IInterface) asInterfaceMethod.invoke(null, binder);
         } catch (Exception e) {
@@ -44,14 +41,14 @@ public final class ServiceManager {
         }
     }
 
-    public static WindowManager getWindowManager() {
+    public WindowManager getWindowManager() {
         if (windowManager == null) {
             windowManager = new WindowManager(getService("window", "android.view.IWindowManager"));
         }
         return windowManager;
     }
 
-    public static DisplayManager getDisplayManager() {
+    public DisplayManager getDisplayManager() {
         if (displayManager == null) {
             try {
                 Class<?> clazz = Class.forName("android.hardware.display.DisplayManagerGlobal");
@@ -65,7 +62,7 @@ public final class ServiceManager {
         return displayManager;
     }
 
-    public static InputManager getInputManager() {
+    public InputManager getInputManager() {
         if (inputManager == null) {
             try {
                 Method getInstanceMethod = android.hardware.input.InputManager.class.getDeclaredMethod("getInstance");
@@ -78,21 +75,21 @@ public final class ServiceManager {
         return inputManager;
     }
 
-    public static PowerManager getPowerManager() {
+    public PowerManager getPowerManager() {
         if (powerManager == null) {
             powerManager = new PowerManager(getService("power", "android.os.IPowerManager"));
         }
         return powerManager;
     }
 
-    public static StatusBarManager getStatusBarManager() {
+    public StatusBarManager getStatusBarManager() {
         if (statusBarManager == null) {
             statusBarManager = new StatusBarManager(getService("statusbar", "com.android.internal.statusbar.IStatusBarService"));
         }
         return statusBarManager;
     }
 
-    public static ClipboardManager getClipboardManager() {
+    public ClipboardManager getClipboardManager() {
         if (clipboardManager == null) {
             IInterface clipboard = getService("clipboard", "android.content.IClipboard");
             if (clipboard == null) {
@@ -106,7 +103,7 @@ public final class ServiceManager {
         return clipboardManager;
     }
 
-    public static ActivityManager getActivityManager() {
+    public ActivityManager getActivityManager() {
         if (activityManager == null) {
             try {
                 // On old Android versions, the ActivityManager is not exposed via AIDL,

server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java

@@ -1,242 +0,0 @@
-package com.genymobile.scrcpy;
-
-import com.genymobile.scrcpy.wrappers.DisplayManager;
-
-import android.view.Display;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class CommandParserTest {
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplay() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "mDisplayId=0\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=2 primaryRefreshRateRange=[90 90] appRequestRefreshRateRange=[90 90]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, "
-                + "real 1440 x 3120, largest app 1440 x 3120, smallest app 1440 x 3120, appVsyncOff 2000000, presDeadline 11111111, mode 2, "
-                + "defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, width=1080, "
-                + "height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], "
-                + "mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, minimalPostProcessingSupported false, rotation 0, state OFF, "
-                + "type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 (515.154 x 514.597) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo DeviceProductInfo{name=, manufacturerPnpId=QCM, "
-                + "productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, relativeAddress=null}, removeMode 0}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
-                + "FLAG_TRUSTED, real 1440 x 3120, largest app 3120 x 2983, smallest app 1440 x 1303, appVsyncOff 2000000, presDeadline 11111111, "
-                + "mode 2, defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, "
-                + "width=1080, height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities "
-                + "HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, "
-                + "minimalPostProcessingSupported false, rotation 0, state ON, type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 "
-                + "(515.154 x 514.597) dpi, layerStack 0, colorMode 0, supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo "
-                + "DeviceProductInfo{name=, manufacturerPnpId=QCM, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, "
-                + "relativeAddress=null}, removeMode 0}\n"
-                + "    mRequestedMinimalPostProcessing=false\n";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(0, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
-        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
-        Assert.assertEquals(1440, displayInfo.getSize().getWidth());
-        Assert.assertEquals(3120, displayInfo.getSize().getHeight());
-    }
-
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplayWithRotation() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "mDisplayId=0\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=2 primaryRefreshRateRange=[90 90] appRequestRefreshRateRange=[90 90]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, "
-                + "real 1440 x 3120, largest app 1440 x 3120, smallest app 1440 x 3120, appVsyncOff 2000000, presDeadline 11111111, mode 2, "
-                + "defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, width=1080, "
-                + "height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], "
-                + "mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, minimalPostProcessingSupported false, rotation 0, state ON, "
-                + "type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 (515.154 x 514.597) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo DeviceProductInfo{name=, manufacturerPnpId=QCM, "
-                + "productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, relativeAddress=null}, removeMode 0}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
-                + "FLAG_TRUSTED, real 3120 x 1440, largest app 3120 x 2983, smallest app 1440 x 1303, appVsyncOff 2000000, presDeadline 11111111, "
-                + "mode 2, defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, "
-                + "width=1080, height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities "
-                + "HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, "
-                + "minimalPostProcessingSupported false, rotation 3, state ON, type INTERNAL, uniqueId \"local:0\", app 3120 x 1440, density 600 "
-                + "(515.154 x 514.597) dpi, layerStack 0, colorMode 0, supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo "
-                + "DeviceProductInfo{name=, manufacturerPnpId=QCM, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, "
-                + "relativeAddress=null}, removeMode 0}\n"
-                + "    mRequestedMinimalPostProcessing=false";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(3, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
-        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
-        Assert.assertEquals(3120, displayInfo.getSize().getWidth());
-        Assert.assertEquals(1440, displayInfo.getSize().getHeight());
-    }
-
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplayAPI31() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "    mDisplayId=0\n"
-                + "    mPhase=1\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
-                + "Infinity]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, "
-                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, "
-                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mRequestedMinimalPostProcessing=false\n"
-                + "    mFrameRateOverrides=[]\n"
-                + "    mPendingFrameRateOverrideUids={}\n";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(0, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
-        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
-        Assert.assertEquals(1080, displayInfo.getSize().getWidth());
-        Assert.assertEquals(2280, displayInfo.getSize().getHeight());
-    }
-
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplayAPI31NoFlags() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "    mDisplayId=0\n"
-                + "    mPhase=1\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
-                + "Infinity]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, "
-                + "real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, "
-                + "real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mRequestedMinimalPostProcessing=false\n"
-                + "    mFrameRateOverrides=[]\n"
-                + "    mPendingFrameRateOverrideUids={}\n";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(0, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        Assert.assertEquals(0, displayInfo.getFlags());
-        Assert.assertEquals(1080, displayInfo.getSize().getWidth());
-        Assert.assertEquals(2280, displayInfo.getSize().getHeight());
-    }
-
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplayAPI29WithNoFlags() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=2\n"
-                + "  Display 0:\n"
-                + "    mDisplayId=0\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mAllowedDisplayModes=[1]\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen, displayId 0\", uniqueId \"local:0\", app 3664 x 1920, "
-                + "real 3664 x 1920, largest app 3664 x 1920, smallest app 3664 x 1920, mode 61, defaultMode 61, modes ["
-                + "{id=1, width=3664, height=1920, fps=60.000004}, {id=2, width=3664, height=1920, fps=61.000004}, "
-                + "{id=61, width=3664, height=1920, fps=120.00001}], colorMode 0, supportedColorModes [0], "
-                + "hdrCapabilities android.view.Display$HdrCapabilities@4a41fe79, rotation 0, density 290 (320.842 x 319.813) dpi, "
-                + "layerStack 0, appVsyncOff 1000000, presDeadline 8333333, type BUILT_IN, address {port=129, model=0}, "
-                + "state ON, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, removeMode 0}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen, displayId 0\", uniqueId \"local:0\", app 3664 x 1920, "
-                + "real 3664 x 1920, largest app 3664 x 3620, smallest app 1920 x 1876, mode 61, defaultMode 61, modes ["
-                + "{id=1, width=3664, height=1920, fps=60.000004}, {id=2, width=3664, height=1920, fps=61.000004}, "
-                + "{id=61, width=3664, height=1920, fps=120.00001}], colorMode 0, supportedColorModes [0], "
-                + "hdrCapabilities android.view.Display$HdrCapabilities@4a41fe79, rotation 0, density 290 (320.842 x 319.813) dpi, "
-                + "layerStack 0, appVsyncOff 1000000, presDeadline 8333333, type BUILT_IN, address {port=129, model=0}, "
-                + "state ON, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, removeMode 0}\n"
-                + "  Display 31:\n"
-                + "    mDisplayId=31\n"
-                + "    mLayerStack=31\n"
-                + "    mHasContent=true\n"
-                + "    mAllowedDisplayModes=[92]\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=PanelLayer-#main\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"PanelLayer-#main, displayId 31\", uniqueId "
-                + "\"virtual:com.test.system,10040,PanelLayer-#main,0\", app 800 x 110, real 800 x 110, largest app 800 x 110, smallest app 800 x "
-                + "110, mode 92, defaultMode 92, modes [{id=92, width=800, height=110, fps=60.0}], colorMode 0, supportedColorModes [0], "
-                + "hdrCapabilities null, rotation 0, density 200 (200.0 x 200.0) dpi, layerStack 31, appVsyncOff 0, presDeadline 16666666, "
-                + "type VIRTUAL, state ON, owner com.test.system (uid 10040), FLAG_PRIVATE, removeMode 1}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"PanelLayer-#main, displayId 31\", uniqueId "
-                + "\"virtual:com.test.system,10040,PanelLayer-#main,0\", app 800 x 110, real 800 x 110, largest app 800 x 800, smallest app 110 x "
-                + "110, mode 92, defaultMode 92, modes [{id=92, width=800, height=110, fps=60.0}], colorMode 0, supportedColorModes [0], "
-                + "hdrCapabilities null, rotation 0, density 200 (200.0 x 200.0) dpi, layerStack 31, appVsyncOff 0, presDeadline 16666666, "
-                + "type VIRTUAL, state OFF, owner com.test.system (uid 10040), FLAG_PRIVATE, removeMode 1}\n";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 31);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(31, displayInfo.getDisplayId());
-        Assert.assertEquals(0, displayInfo.getRotation());
-        Assert.assertEquals(31, displayInfo.getLayerStack());
-        Assert.assertEquals(0, displayInfo.getFlags());
-        Assert.assertEquals(800, displayInfo.getSize().getWidth());
-        Assert.assertEquals(110, displayInfo.getSize().getHeight());
-    }
-}