Add fallback to get DisplayInfo

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

Signed-off-by: Romain Vimont <rom@rom1v.com>

app/meson.build

@@ -188,7 +188,7 @@ conf.set_quoted('SCRCPY_VERSION', meson.project_version())
 # the prefix used during configuration (meson --prefix=PREFIX)
 conf.set_quoted('PREFIX', get_option('prefix'))
 
-# build a "portable" version (with scrcpy-server.apk accessible from the same
+# build a "portable" version (with scrcpy-server accessible from the same
 # directory as the executable)
 conf.set('PORTABLE', get_option('portable'))
 

app/scrcpy.1

@@ -110,10 +110,6 @@ However, the option is only available when the HID keyboard is enabled (or a phy
 
 Also see \fB\-\-hid\-mouse\fR.
 
-.TP
-.B \-\-install
-Install the server (via "adb install") rather than pushing it to /data/local/tmp (via "adb push").
-
 .TP
 .B \-\-legacy\-paste
 Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+Shift+v).
@@ -246,10 +242,6 @@ option if set, or by the file extension (.mp4 or .mkv).
 .BI "\-\-record\-format " format
 Force recording format (either mp4 or mkv).
 
-.TP
-.B \-\-reinstall
-Reinstall the server (via "adb install"), even if the correct version is already installed. Implies \fB\-\-install\fR.
-
 .TP
 .BI "\-\-render\-driver " name
 Request SDL to use the given render driver (this is just a hint).

app/src/adb/adb.c

@@ -329,17 +329,6 @@ sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,
     return process_check_success_intr(intr, pid, "adb install", flags);
 }
 
-bool
-sc_adb_uninstall(struct sc_intr *intr, const char *serial, const char *pkg,
-                 unsigned flags) {
-    assert(serial);
-    const char *const argv[] =
-        SC_ADB_COMMAND("-s", serial, "uninstall", pkg);
-
-    sc_pid pid = sc_adb_execute(argv, flags);
-    return process_check_success_intr(intr, pid, "adb uninstall", flags);
-}
-
 bool
 sc_adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
              unsigned flags) {
@@ -446,7 +435,6 @@ sc_adb_list_devices(struct sc_intr *intr, unsigned flags,
              "Please report an issue.");
         return false;
     }
-#undef BUFSIZE
 
     // It is parsed as a NUL-terminated string
     buf[r] = '\0';
@@ -725,99 +713,3 @@ sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {
 
     return sc_adb_parse_device_ip(buf);
 }
-
-char *
-sc_adb_get_installed_apk_path(struct sc_intr *intr, const char *serial,
-                              unsigned flags) {
-    assert(serial);
-    const char *const argv[] =
-        SC_ADB_COMMAND("-s", serial, "shell", "pm", "list", "package", "-f",
-                       SC_ANDROID_PACKAGE);
-
-    sc_pipe pout;
-    sc_pid pid = sc_adb_execute_p(argv, flags, &pout);
-    if (pid == SC_PROCESS_NONE) {
-        LOGD("Could not execute \"pm list packages\"");
-        return NULL;
-    }
-
-    // "pm list packages -f <package>" output should contain only one line, so
-    // the output should be short
-    char buf[1024];
-    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
-    sc_pipe_close(pout);
-
-    bool ok = process_check_success_intr(intr, pid, "pm list packages", flags);
-    if (!ok) {
-        return NULL;
-    }
-
-    if (r == -1) {
-        return NULL;
-    }
-
-    assert((size_t) r < sizeof(buf));
-    if (r == sizeof(buf) - 1)  {
-        // The implementation assumes that the output of "pm list packages"
-        // fits in the buffer in a single pass
-        LOGW("Result of \"pm list package\" does not fit in 1Kb. "
-             "Please report an issue.");
-        return NULL;
-    }
-
-    // It is parsed as a NUL-terminated string
-    buf[r] = '\0';
-
-    return sc_adb_parse_installed_apk_path(buf);
-}
-
-char *
-sc_adb_get_installed_apk_version(struct sc_intr *intr, const char *serial,
-                                 unsigned flags) {
-    assert(serial);
-    const char *const argv[] =
-        SC_ADB_COMMAND("-s", serial, "shell", "dumpsys", "package",
-                       SC_ANDROID_PACKAGE);
-
-    sc_pipe pout;
-    sc_pid pid = sc_adb_execute_p(argv, flags, &pout);
-    if (pid == SC_PROCESS_NONE) {
-        LOGD("Could not execute \"dumpsys package\"");
-        return NULL;
-    }
-
-    // "dumpsys package" output can be huge (e.g. 16k), but versionName is at
-    // the beginning, typically in the first 1024 bytes (64k should be enough
-    // for the whole output anyway)
-#define BUFSIZE 65536
-    char *buf = malloc(BUFSIZE);
-    if (!buf) {
-        return false;
-    }
-    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, BUFSIZE - 1);
-    sc_pipe_close(pout);
-
-    bool ok = process_check_success_intr(intr, pid, "dumpsys package", flags);
-    if (!ok) {
-        free(buf);
-        return NULL;
-    }
-
-    if (r == -1) {
-        free(buf);
-        return NULL;
-    }
-
-    assert((size_t) r < BUFSIZE);
-#undef BUFSIZE
-    // if r == sizeof(buf), then the output is truncated, but we don't care,
-    // versionName is at the beginning in practice, and is unlikely to be
-    // truncated at 64k
-
-    // It is parsed as a NUL-terminated string
-    buf[r] = '\0';
-
-    char *version = sc_adb_parse_installed_apk_version(buf);
-    free(buf);
-    return version;
-}

app/src/adb/adb.h

@@ -15,8 +15,6 @@
 
 #define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)
 
-#define SC_ANDROID_PACKAGE "com.genymobile.scrcpy"
-
 const char *
 sc_adb_get_executable(void);
 
@@ -66,10 +64,6 @@ bool
 sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,
                unsigned flags);
 
-bool
-sc_adb_uninstall(struct sc_intr *intr, const char *serial, const char *pkg,
-                 unsigned flags);
-
 /**
  * Execute `adb tcpip <port>`
  */
@@ -120,18 +114,4 @@ sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
 char *
 sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags);
 
-/**
- * Return the path of the installed APK for com.genymobile.scrcpy (if any)
- */
-char *
-sc_adb_get_installed_apk_path(struct sc_intr *intr, const char *serial,
-                              unsigned flags);
-
-/**
- * Return the version of the installed APK for com.genymobile.scrcpy (if any)
- */
-char *
-sc_adb_get_installed_apk_version(struct sc_intr *intr, const char *serial,
-                                 unsigned flags);
-
 #endif

app/src/adb/adb_parser.c

@@ -225,62 +225,3 @@ sc_adb_parse_device_ip(char *str) {
 
     return NULL;
 }
-
-char *
-sc_adb_parse_installed_apk_path(char *str) {
-    // str is expected to look like:
-    // "package:/data/app/.../base.apk=com.genymobile.scrcpy"
-    //          ^^^^^^^^^^^^^^^^^^^^^^
-    // We want to extract the path (which may contain '=', even in practice)
-
-    if (strncmp(str, "package:", 8)) {
-        // Does not start with "package:"
-        return NULL;
-    }
-
-    char *s = str + 8;
-    size_t len = strcspn(s, " \r\n");
-    s[len] = '\0';
-
-    char *p = strrchr(s, '=');
-    if (!p) {
-        // No '=' found
-        return NULL;
-    }
-
-    // Truncate at the last '='
-    *p = '\0';
-
-    return strdup(s);
-}
-
-char *
-sc_adb_parse_installed_apk_version(const char *str) {
-    // str is the (beginning of the) output of `dumpsys package`
-    // We want to extract the version string from a line starting with 4 spaces
-    // then `versionName=` then the version string.
-
-#define VERSION_NAME_PREFIX "\n    versionName="
-    char *s = strstr(str, VERSION_NAME_PREFIX);
-    if (!s) {
-        // Not found
-        return NULL;
-    }
-
-    s+= sizeof(VERSION_NAME_PREFIX) - 1;
-
-    size_t len = strspn(s, "0123456789.");
-    if (!len) {
-        LOGW("Unexpected version name with no value");
-        return NULL;
-    }
-
-    char *version = malloc(len + 1);
-    if (!version) {
-        return NULL;
-    }
-
-    memcpy(version, s, len);
-    version[len] = '\0';
-    return version;
-}

app/src/adb/adb_parser.h

@@ -27,24 +27,4 @@ sc_adb_parse_devices(char *str, struct sc_vec_adb_devices *out_vec);
 char *
 sc_adb_parse_device_ip(char *str);
 
-/**
- * Parse the package path from the output of
- * `adb shell pm list packages -f <package>`
- *
- * The parameter must be a NUL-terminated string.
- *
- * Warning: this function modifies the buffer for optimization purposes.
- */
-char *
-sc_adb_parse_installed_apk_path(char *str);
-
-/**
- * Parse the package version from the output of
- * `adb shell dumpsys package <package>`
- *
- * The parameter must be a NUL-terminated string.
- */
-char *
-sc_adb_parse_installed_apk_version(const char *str);
-
 #endif

app/src/cli.c

@@ -57,8 +57,6 @@
 #define OPT_NO_CLEANUP             1037
 #define OPT_PRINT_FPS              1038
 #define OPT_NO_POWER_ON            1039
-#define OPT_INSTALL                1040
-#define OPT_REINSTALL              1041
 
 struct sc_option {
     char shortopt;
@@ -209,12 +207,6 @@ static const struct sc_option options[] = {
         .longopt = "help",
         .text = "Print this help.",
     },
-    {
-        .longopt_id = OPT_INSTALL,
-        .longopt = "install",
-        .text = "Install the server (via 'adb install') rather than pushing "
-                "it to /data/local/tmp (via 'adb push').",
-    },
     {
         .longopt_id = OPT_LEGACY_PASTE,
         .longopt = "legacy-paste",
@@ -386,13 +378,6 @@ static const struct sc_option options[] = {
         .argdesc = "format",
         .text = "Force recording format (either mp4 or mkv).",
     },
-    {
-        .longopt_id = OPT_REINSTALL,
-        .longopt = "reinstall",
-        .text = "Reinstall the server (via 'adb install'), even if the correct "
-                "version is already installed.\n"
-                "Implies --install.",
-    },
     {
         .longopt_id = OPT_RENDER_DRIVER,
         .longopt = "render-driver",
@@ -1625,13 +1610,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
             case OPT_PRINT_FPS:
                 opts->start_fps_counter = true;
                 break;
-            case OPT_INSTALL:
-                opts->install = true;
-                break;
-            case OPT_REINSTALL:
-                opts->install = true;
-                opts->reinstall = true;
-                break;
             case OPT_OTG:
 #ifdef HAVE_USB
                 opts->otg = true;

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/options.c

@@ -65,6 +65,4 @@ const struct scrcpy_options scrcpy_options_default = {
     .cleanup = true,
     .start_fps_counter = false,
     .power_on = true,
-    .install = false,
-    .reinstall = false,
 };

app/src/options.h

@@ -140,8 +140,6 @@ struct scrcpy_options {
     bool cleanup;
     bool start_fps_counter;
     bool power_on;
-    bool install;
-    bool reinstall;
 };
 
 extern const struct scrcpy_options scrcpy_options_default;

app/src/scrcpy.c

@@ -325,8 +325,6 @@ scrcpy(struct scrcpy_options *options) {
         .tcpip_dst = options->tcpip_dst,
         .cleanup = options->cleanup,
         .power_on = options->power_on,
-        .install = options->install,
-        .reinstall = options->reinstall,
     };
 
     static const struct sc_server_callbacks cbs = {

app/src/server.c

@@ -14,11 +14,10 @@
 #include "util/process_intr.h"
 #include "util/str.h"
 
-#define SC_SERVER_FILENAME "scrcpy-server.apk"
+#define SC_SERVER_FILENAME "scrcpy-server"
-#define SC_SERVER_PACKAGE "com.genymobile.scrcpy"
 
 #define SC_SERVER_PATH_DEFAULT PREFIX "/share/scrcpy/" SC_SERVER_FILENAME
-#define SC_DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.apk"
+#define SC_DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"
 
 static char *
 get_server_path(void) {
@@ -105,10 +104,7 @@ error:
 }
 
 static bool
-push_server(struct sc_intr *intr, const char *serial, bool install,
+push_server(struct sc_intr *intr, const char *serial) {
-            bool reinstall) {
-    assert(install || !reinstall); // reinstall implies install
-
     char *server_path = get_server_path();
     if (!server_path) {
         return false;
@@ -118,28 +114,7 @@ push_server(struct sc_intr *intr, const char *serial, bool install,
         free(server_path);
         return false;
     }
-    bool ok;
+    bool ok = sc_adb_push(intr, serial, server_path, SC_DEVICE_SERVER_PATH, 0);
-
-    if (install) {
-        char *version = sc_adb_get_installed_apk_version(intr, serial, 0);
-        bool same_version = version && !strcmp(version, SCRCPY_VERSION);
-        free(version);
-        if (!reinstall && same_version) {
-            LOGI("Server " SCRCPY_VERSION " already installed");
-            ok = true;
-        } else {
-            LOGI("Installing server " SCRCPY_VERSION);
-            // If a server with a different signature is installed, or if a
-            // newer server is already installed, we must uninstall it first.
-            ok = sc_adb_uninstall(intr, serial, SC_SERVER_PACKAGE,
-                                  SC_ADB_SILENT);
-            (void) ok; // expected to fail if it is not installed
-            ok = sc_adb_install(intr, serial, server_path, 0);
-        }
-    } else {
-        ok = sc_adb_push(intr, serial, server_path, SC_DEVICE_SERVER_PATH, 0);
-    }
-
     free(server_path);
     return ok;
 }
@@ -177,38 +152,6 @@ sc_server_sleep(struct sc_server *server, sc_tick deadline) {
     return !stopped;
 }
 
-static char *
-get_classpath_cmd(struct sc_intr *intr, const char *serial, bool install) {
-    if (!install) {
-        // In push mode, the path is known statically
-        char *cp = strdup("CLASSPATH=" SC_DEVICE_SERVER_PATH);
-        if (!cp) {
-            LOG_OOM();
-        }
-        return cp;
-    }
-
-    char *apk_path = sc_adb_get_installed_apk_path(intr, serial, 0);
-    if (!apk_path) {
-        LOGE("Could not get device apk path");
-        return NULL;
-    }
-
-#define PREFIX_SIZE (sizeof("CLASSPATH=") - 1)
-    size_t len = strlen(apk_path);
-    char *cp = malloc(PREFIX_SIZE + len + 1);
-    if (!cp) {
-        LOG_OOM();
-        free(apk_path);
-        return NULL;
-    }
-
-    memcpy(cp, "CLASSPATH=", PREFIX_SIZE);
-    memcpy(cp + PREFIX_SIZE, apk_path, len + 1);
-    free(apk_path);
-    return cp;
-}
-
 static sc_pid
 execute_server(struct sc_server *server,
                const struct sc_server_params *params) {
@@ -217,20 +160,13 @@ execute_server(struct sc_server *server,
     const char *serial = server->serial;
     assert(serial);
 
-    char *classpath = get_classpath_cmd(&server->intr, serial, params->install);
-    if (!classpath) {
-        return SC_PROCESS_NONE;
-    }
-
-    LOGD("Using %s", classpath);
-
     const char *cmd[128];
     unsigned count = 0;
     cmd[count++] = sc_adb_get_executable();
     cmd[count++] = "-s";
     cmd[count++] = serial;
     cmd[count++] = "shell";
-    cmd[count++] = classpath;
+    cmd[count++] = "CLASSPATH=" SC_DEVICE_SERVER_PATH;
     cmd[count++] = "app_process";
 
 #ifdef SERVER_DEBUGGER
@@ -316,10 +252,6 @@ execute_server(struct sc_server *server,
         // By default, power_on is true
         ADD_PARAM("power_on=false");
     }
-    if (params->install) {
-        // By default, installed is false
-        ADD_PARAM("installed=true");
-    }
 
 #undef ADD_PARAM
 
@@ -340,8 +272,6 @@ execute_server(struct sc_server *server,
     pid = sc_adb_execute(cmd, 0);
 
 end:
-    free(classpath);
-
     for (unsigned i = dyn_idx; i < count; ++i) {
         free((char *) cmd[i]);
     }
@@ -825,9 +755,8 @@ run_server(void *data) {
     assert(serial);
     LOGD("Device serial: %s", serial);
 
-    ok = push_server(&server->intr, serial, params->install, params->reinstall);
+    ok = push_server(&server->intr, serial);
     if (!ok) {
-        LOGE("Failed to push server");
         goto error_connection_failed;
     }
 

app/src/server.h

@@ -48,8 +48,6 @@ struct sc_server_params {
     bool select_tcpip;
     bool cleanup;
     bool power_on;
-    bool install;
-    bool reinstall;
 };
 
 struct sc_server {

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);
+            // Close stdout in the child process
-            if (devnull != -1) {
+            close(STDOUT_FILENO);
-                dup2(devnull, STDOUT_FILENO);
-            } else {
-                LOGE("Could not open /dev/null for stdout");
-            }
         }
 
         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);
+            // Close stderr in the child process
-            if (devnull != -1) {
+            close(STDERR_FILENO);
-                dup2(devnull, STDERR_FILENO);
-            } else {
-                LOGE("Could not open /dev/null for stderr");
-            }
         }
 
         close(internal[0]);

app/tests/test_adb_parser.c

@@ -241,54 +241,6 @@ static void test_get_ip_truncated(void) {
     assert(!ip);
 }
 
-static void test_apk_path(void) {
-    char str[] = "package:/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile."
-                 "scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk=com.genymobile."
-                 "scrcpy\n";
-
-    const char *expected = "/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile"
-                           ".scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk";
-    char *path = sc_adb_parse_installed_apk_path(str);
-    assert(!strcmp(path, expected));
-    free(path);
-}
-
-static void test_apk_path_invalid(void) {
-    // Does not start with "package:"
-    char str[] = "garbage:/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile."
-                 "scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk=com.genymobile."
-                 "scrcpy\n";
-
-    char *path = sc_adb_parse_installed_apk_path(str);
-    assert(!path);
-}
-
-static void test_apk_version(void) {
-    char str[] =
-        "Key Set Manager:\n"
-        "  [com.genymobile.scrcpy]\n"
-        "      Signing KeySets: 128\n"
-        "\n"
-        "Packages:\n"
-        "  Package [com.genymobile.scrcpy] (89abcdef):\n"
-        "    userId=12345\n"
-        "    pkg=Package{012345 com.genymobile.scrcpy}\n"
-        "    codePath=/data/app/~~abcdef==/com.genymobile.scrcpy-012345==\n"
-        "    resourcePath=/data/app/~~abcdef==/com.genymobile.scrcpy-013245==\n"
-        "    primaryCpuAbi=null\n"
-        "    secondaryCpuAbi=null\n"
-        "    versionCode=12400 minSdk=21 targetSdk=31\n"
-        "    versionName=1.24\n"
-        "    splits=[base]\n"
-        "    apkSigningVersion=2\n"
-        "    applicationInfo=ApplicationInfo{012345 com.genymobile.scrcpy}\n";
-
-    const char *expected = "1.24";
-    char *version = sc_adb_parse_installed_apk_version(str);
-    assert(!strcmp(version, expected));
-    free(version);
-}
-
 int main(int argc, char *argv[]) {
     (void) argc;
     (void) argv;
@@ -311,9 +263,5 @@ int main(int argc, char *argv[]) {
     test_get_ip_no_wlan_without_eol();
     test_get_ip_truncated();
 
-    test_apk_path();
-    test_apk_path_invalid();
-    test_apk_version();
-
     return 0;
 }

run

@@ -21,5 +21,5 @@ then
 fi
 
 SCRCPY_ICON_PATH="app/data/icon.png" \
-SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server.apk" \
+SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" \
 "$BUILDDIR/app/scrcpy" "$@"

server/.gitignore

@@ -6,4 +6,3 @@
 /build
 /captures
 .externalNativeBuild
-/keystore.properties

server/HOWTO_keystore.txt

@@ -1,12 +0,0 @@
-For an APK to be installable, it must be signed: <https://developer.android.com/training/articles/keystore>
-
-For that purpose, create a keystore by executing this command:
-
-    keytool -genkey -v -keystore ~/.android/scrcpy.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias scrcpy -dname cn=scrcpy
-
-(Adapt ~/.android/scrcpy.keystore if you want to generate it to another location.)
-
-Then create server/keystore.properties and edit its properties:
-
-    cp keystore.properties.sample keystore.properties
-    vim keystore.properties  # fill the properties

server/build.gradle

@@ -10,26 +10,10 @@ android {
         versionName "1.24"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-    signingConfigs {
-        release {
-            // to be defined in server/keystore.properties (see server/HOWTO_keystore.txt)
-            def keystorePropsFile = rootProject.file("server/keystore.properties")
-            if (keystorePropsFile.exists()) {
-                def props = new Properties()
-                props.load(new FileInputStream(keystorePropsFile))
-
-                storeFile rootProject.file(props['storeFile'])
-                storePassword props['storePassword']
-                keyAlias props['keyAlias']
-                keyPassword props['keyPassword']
-            }
-        }
-    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
         }
     }
 }

server/build_without_gradle.sh

@@ -14,42 +14,13 @@ set -e
 SCRCPY_DEBUG=false
 SCRCPY_VERSION_NAME=1.24
 
-SERVER_DIR="$(realpath $(dirname "$0"))"
-KEYSTORE_PROPERTIES_FILE="$SERVER_DIR/keystore.properties"
-
-if [[ ! -f "$KEYSTORE_PROPERTIES_FILE" ]]
-then
-    echo "The file '$KEYSTORE_PROPERTIES_FILE' does not exist." >&2
-    echo "Please read '$SERVER_DIR/HOWTO_keystore.txt'." >&2
-    exit 1
-fi
-
-declare -A props
-while IFS='=' read -r key value
-do
-    props["$key"]="$value"
-done < "$KEYSTORE_PROPERTIES_FILE"
-
-KEYSTORE_FILE=${props['storeFile']}
-KEYSTORE_PASSWORD=${props['storePassword']}
-KEYSTORE_KEY_ALIAS=${props['keyAlias']}
-KEYSTORE_KEY_PASSWORD=${props['keyPassword']}
-
-if [[ ! -f "$KEYSTORE_FILE" ]]
-then
-    echo "Keystore '$KEYSTORE_FILE' (read from '$KEYSTORE_PROPERTIES_FILE')" \
-         "does not exist." >&2
-    echo "Please read '$SERVER_DIR/HOWTO_keystore.txt'." >&2
-    exit 2
-fi
-
 PLATFORM=${ANDROID_PLATFORM:-33}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-33.0.0}
-BUILD_TOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOLS"
 
 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
 CLASSES_DIR="$BUILD_DIR/classes"
-SERVER_BINARY=scrcpy-server.apk
+SERVER_DIR=$(dirname "$0")
+SERVER_BINARY=scrcpy-server
 ANDROID_JAR="$ANDROID_HOME/platforms/android-$PLATFORM/android.jar"
 
 echo "Platform: android-$PLATFORM"
@@ -70,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
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
-"$BUILD_TOOLS_DIR/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..."
@@ -87,15 +59,20 @@ 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 \
         com/genymobile/scrcpy/wrappers/*.class
+
+    echo "Archiving..."
     cd "$BUILD_DIR"
+    jar cvf "$SERVER_BINARY" classes.dex
+    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 \
@@ -103,24 +80,8 @@ else
         com/genymobile/scrcpy/wrappers/*.class
 
     cd "$BUILD_DIR"
-    unzip -o classes.zip classes.dex  # we need the inner classes.dex
+    mv classes.zip "$SERVER_BINARY"
+    rm -rf classes
 fi
 
-echo "Packaging..."
-# note: if a res directory exists, add: -S "$SERVER_DIR/src/main/res"
-"$BUILD_TOOLS_DIR/aapt" package -f \
-    -M "$SERVER_DIR/src/main/AndroidManifest.xml" \
-    -I "$ANDROID_JAR" \
-    -F "$SERVER_BINARY.unaligned"
-"$BUILD_TOOLS_DIR/aapt" add "$SERVER_BINARY.unaligned" classes.dex
-"$BUILD_TOOLS_DIR/zipalign" -p 4 "$SERVER_BINARY.unaligned" "$SERVER_BINARY"
-rm "$SERVER_BINARY.unaligned"
-
-"$BUILD_TOOLS_DIR/apksigner" sign \
-    --ks "$KEYSTORE_FILE" \
-    --ks-pass "pass:$KEYSTORE_PASSWORD" \
-    --ks-key-alias "$KEYSTORE_KEY_ALIAS" \
-    --key-pass "pass:$KEYSTORE_KEY_PASSWORD" \
-    "$SERVER_BINARY"
-
 echo "Server generated in $BUILD_DIR/$SERVER_BINARY"

server/keystore.properties.sample

@@ -1,4 +0,0 @@
-storeFile=/path/to/your/keystore
-storePassword=PASSWORD
-keyAlias=scrcpy
-keyPassword=PASSWORD

server/meson.build

@@ -6,7 +6,7 @@ if prebuilt_server == ''
                   # gradle is responsible for tracking source changes
                   build_by_default: true,
                   build_always_stale: true,
-                  output: 'scrcpy-server.apk',
+                  output: 'scrcpy-server',
                   command: [find_program('./scripts/build-wrapper.sh'), meson.current_source_dir(), '@OUTPUT@', get_option('buildtype')],
                   console: true,
                   install: true,
@@ -18,7 +18,7 @@ else
     endif
     custom_target('scrcpy-server-prebuilt',
                   input: prebuilt_server,
-                  output: 'scrcpy-server.apk',
+                  output: 'scrcpy-server',
                   command: ['cp', '@INPUT@', '@OUTPUT@'],
                   install: true,
                   install_dir: 'share/scrcpy')

server/scripts/build-wrapper.sh

@@ -25,5 +25,5 @@ then
     cp "$PROJECT_ROOT/build/outputs/apk/debug/server-debug.apk" "$OUTPUT"
 else
     "$GRADLE" -p "$PROJECT_ROOT" assembleRelease
-    cp "$PROJECT_ROOT/build/outputs/apk/release/server-release.apk" "$OUTPUT"
+    cp "$PROJECT_ROOT/build/outputs/apk/release/server-release-unsigned.apk" "$OUTPUT"
 fi

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

@@ -16,7 +16,7 @@ import java.io.IOException;
  */
 public final class CleanUp {
 
-    public static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.apk";
+    public static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
 
     // A simple struct to be passed from the main process to the cleanup process
     public static class Config implements Parcelable {
@@ -37,8 +37,6 @@ public final class CleanUp {
         private static final int FLAG_RESTORE_NORMAL_POWER_MODE = 2;
         private static final int FLAG_POWER_OFF_SCREEN = 4;
 
-        private boolean installed;
-
         private int displayId;
 
         // Restore the value (between 0 and 7), -1 to not restore
@@ -54,7 +52,6 @@ public final class CleanUp {
         }
 
         protected Config(Parcel in) {
-            installed = in.readInt() != 0;
             displayId = in.readInt();
             restoreStayOn = in.readInt();
             byte options = in.readByte();
@@ -65,7 +62,6 @@ public final class CleanUp {
 
         @Override
         public void writeToParcel(Parcel dest, int flags) {
-            dest.writeInt(installed ? 1 : 0);
             dest.writeInt(displayId);
             dest.writeInt(restoreStayOn);
             byte options = 0;
@@ -120,10 +116,9 @@ public final class CleanUp {
         // not instantiable
     }
 
-    public static void configure(boolean installed, int displayId, int restoreStayOn, boolean disableShowTouches, boolean restoreNormalPowerMode, boolean powerOffScreen)
+    public static void configure(int displayId, int restoreStayOn, boolean disableShowTouches, boolean restoreNormalPowerMode, boolean powerOffScreen)
             throws IOException {
         Config config = new Config();
-        config.installed = installed;
         config.displayId = displayId;
         config.disableShowTouches = disableShowTouches;
         config.restoreStayOn = restoreStayOn;
@@ -132,9 +127,8 @@ public final class CleanUp {
 
         if (config.hasWork()) {
             startProcess(config);
-        } else if (!installed) {
+        } else {
-            // There is no additional clean up to do when scrcpy dies.
+            // There is no additional clean up to do when scrcpy dies
-            // If the APK has been pushed to /data/local/tmp, remove it.
             unlinkSelf();
         }
     }
@@ -142,7 +136,6 @@ public final class CleanUp {
     private static void startProcess(Config config) throws IOException {
         String[] cmd = {"app_process", "/", CleanUp.class.getName(), config.toBase64()};
 
-        // TODO if scrcpy is "installed", then we must find the install path!
         ProcessBuilder builder = new ProcessBuilder(cmd);
         builder.environment().put("CLASSPATH", SERVER_PATH);
         builder.start();
@@ -157,12 +150,7 @@ public final class CleanUp {
     }
 
     public static void main(String... args) {
-        Config config = Config.fromBase64(args[0]);
+        unlinkSelf();
-
-        if (!config.installed) {
-            // If the APK has been pushed to /data/local/tmp, remove it.
-            unlinkSelf();
-        }
 
         try {
             // Wait for the server to die
@@ -173,6 +161,8 @@ public final class CleanUp {
 
         Ln.i("Cleaning up");
 
+        Config config = Config.fromBase64(args[0]);
+
         if (config.disableShowTouches || config.restoreStayOn != -1) {
             ServiceManager serviceManager = new ServiceManager();
             Settings settings = new Settings(serviceManager);

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

@@ -7,7 +7,6 @@ import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import com.genymobile.scrcpy.wrappers.WindowManager;
 
 import android.content.IOnPrimaryClipChangedListener;
-import android.content.pm.ApplicationInfo;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
@@ -22,8 +21,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class Device {
 
-    private static final String SCRCPY_PACKAGE_NAME = "com.genymobile.scrcpy";
-
     public static final int POWER_MODE_OFF = SurfaceControl.POWER_MODE_OFF;
     public static final int POWER_MODE_NORMAL = SurfaceControl.POWER_MODE_NORMAL;
 
@@ -322,12 +319,4 @@ public final class Device {
     public static Settings getSettings() {
         return SETTINGS;
     }
-
-    public static String getApkPath() {
-        ApplicationInfo info = SERVICE_MANAGER.getPackageManager().getApplicationInfo(SCRCPY_PACKAGE_NAME);
-        if (info == null) {
-            return null;
-        }
-        return info.sourceDir;
-    }
 }

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

@@ -23,7 +23,6 @@ public class Options {
     private boolean downsizeOnError = true;
     private boolean cleanup = true;
     private boolean powerOn = true;
-    private boolean installed = false;
 
     // Options not used by the scrcpy client, but useful to use scrcpy-server directly
     private boolean sendDeviceMeta = true; // send device name and size
@@ -197,12 +196,4 @@ public class Options {
     public void setSendDummyByte(boolean sendDummyByte) {
         this.sendDummyByte = sendDummyByte;
     }
-
-    public boolean getInstalled() {
-        return installed;
-    }
-
-    public void setInstalled(boolean installed) {
-        this.installed = installed;
-    }
 }

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

@@ -52,8 +52,8 @@ public final class Server {
 
         if (options.getCleanup()) {
             try {
-                CleanUp.configure(options.getInstalled(), options.getDisplayId(), restoreStayOn, mustDisableShowTouchesOnCleanUp,
+                CleanUp.configure(options.getDisplayId(), restoreStayOn, mustDisableShowTouchesOnCleanUp, restoreNormalPowerMode,
-                        restoreNormalPowerMode, options.getPowerOffScreenOnClose());
+                        options.getPowerOffScreenOnClose());
             } catch (IOException e) {
                 Ln.e("Could not configure cleanup", e);
             }
@@ -252,10 +252,6 @@ public final class Server {
                     boolean powerOn = Boolean.parseBoolean(value);
                     options.setPowerOn(powerOn);
                     break;
-                case "installed":
-                    boolean installed = Boolean.parseBoolean(value);
-                    options.setInstalled(installed);
-                    break;
                 case "send_device_meta":
                     boolean sendDeviceMeta = Boolean.parseBoolean(value);
                     options.setSendDeviceMeta(sendDeviceMeta);

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

@@ -21,8 +21,8 @@ public final class DisplayManager {
     // 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]+).*?, "
+                "^    mBaseDisplayInfo=DisplayInfo\\{\".*?\", displayId " + displayId + ".*?(, FLAG_.*)?, real ([0-9]+) x ([0-9]+).*?, rotation "
-                        + "rotation ([0-9]+).*?, layerStack ([0-9]+)",
+                        + "([0-9]+).*?, layerStack ([0-9]+)",
                 Pattern.MULTILINE);
         Matcher m = regex.matcher(dumpsysDisplayOutput);
         if (!m.find()) {

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

@@ -1,36 +0,0 @@
-package com.genymobile.scrcpy.wrappers;
-
-import com.genymobile.scrcpy.Ln;
-
-import android.content.pm.ApplicationInfo;
-import android.os.IInterface;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class PackageManager {
-
-    private IInterface manager;
-    private Method getApplicationInfoMethod;
-
-    public PackageManager(IInterface manager) {
-        this.manager = manager;
-    }
-
-    private Method getGetApplicationInfoMethod() throws NoSuchMethodException {
-        if (getApplicationInfoMethod == null) {
-            getApplicationInfoMethod = manager.getClass().getDeclaredMethod("getApplicationInfo", String.class, int.class, int.class);
-        }
-        return getApplicationInfoMethod;
-    }
-
-    public ApplicationInfo getApplicationInfo(String packageName) {
-        try {
-            Method method = getGetApplicationInfoMethod();
-            return (ApplicationInfo) method.invoke(manager, packageName, 0, ServiceManager.USER_ID);
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Cannot get application info", e);
-            return null;
-        }
-    }
-}

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

@@ -22,7 +22,6 @@ public final class ServiceManager {
     private StatusBarManager statusBarManager;
     private ClipboardManager clipboardManager;
     private ActivityManager activityManager;
-    private PackageManager packageManager;
 
     public ServiceManager() {
         try {
@@ -120,20 +119,4 @@ public final class ServiceManager {
 
         return activityManager;
     }
-
-    public PackageManager getPackageManager() {
-        if (packageManager == null) {
-            try {
-                //IInterface manager = getService("package", "android.content.pm.IPackageManager");
-                Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
-                Method getPackageManager = activityThreadClass.getDeclaredMethod("getPackageManager");
-                IInterface manager = (IInterface) getPackageManager.invoke(null);
-                return new PackageManager(manager);
-            } catch (Exception e) {
-                throw new AssertionError(e);
-            }
-        }
-
-        return packageManager;
-    }
 }

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

@@ -3,6 +3,7 @@ package com.genymobile.scrcpy;
 import com.genymobile.scrcpy.wrappers.DisplayManager;
 
 import android.view.Display;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -49,48 +50,6 @@ public class CommandParserTest {
         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 */
@@ -100,30 +59,29 @@ public class CommandParserTest {
                 + "    mPhase=1\n"
                 + "    mLayerStack=0\n"
                 + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
+                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 Infinity]}\n"
-                + "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, "
+                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS"
-                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff "
+                + ", FLAG_TRUSTED, real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff 1000000, presDeadline 16666666, "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, alternativeRefreshRates=[]}], "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, mMaxAverageLuminance=500.0, mMinLuminance=0.0}, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state ON, type INTERNAL, uniqueId \"local:4619827259835644672\", "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, supportedColorModes [0], address {port=0, model=0x401cec6a7a2b7b}, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "deviceProductInfo DeviceProductInfo{name=EMU_display_0, manufacturerPnpId=GGL, productId=1, modelYear=null, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, removeMode 0, refreshRateOverride 0.0, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, "
+                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
-                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
+                + "FLAG_TRUSTED, real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff 1000000, presDeadline 16666666, mode 1, "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{"
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "mSupportedHdrTypes=[], mMaxLuminance=500.0, mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "minimalPostProcessingSupported false, rotation 0, state ON, type INTERNAL, uniqueId \"local:4619827259835644672\", app 1080 x 2148, "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, supportedColorModes [0], address {port=0, model=0x401cec6a7a2b7b}, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "deviceProductInfo DeviceProductInfo{name=EMU_display_0, manufacturerPnpId=GGL, productId=1, modelYear=null, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, removeMode 0, refreshRateOverride 0.0, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
                 + "    mRequestedMinimalPostProcessing=false\n"
                 + "    mFrameRateOverrides=[]\n"
                 + "    mPendingFrameRateOverrideUids={}\n";
@@ -147,30 +105,29 @@ public class CommandParserTest {
                 + "    mPhase=1\n"
                 + "    mLayerStack=0\n"
                 + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
+                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 Infinity]}\n"
-                + "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 "
+                + "real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff 1000000, presDeadline 16666666, "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, alternativeRefreshRates=[]}], "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, mMaxAverageLuminance=500.0, mMinLuminance=0.0}, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state ON, type INTERNAL, uniqueId \"local:4619827259835644672\", "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, supportedColorModes [0], address {port=0, model=0x401cec6a7a2b7b}, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "deviceProductInfo DeviceProductInfo{name=EMU_display_0, manufacturerPnpId=GGL, productId=1, modelYear=null, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, removeMode 0, refreshRateOverride 0.0, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, "
+                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
-                + "real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
+                + "FLAG_TRUSTED, real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff 1000000, presDeadline 16666666, mode 1, "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{"
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "mSupportedHdrTypes=[], mMaxLuminance=500.0, mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "minimalPostProcessingSupported false, rotation 0, state ON, type INTERNAL, uniqueId \"local:4619827259835644672\", app 1080 x 2148, "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, supportedColorModes [0], address {port=0, model=0x401cec6a7a2b7b}, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "deviceProductInfo DeviceProductInfo{name=EMU_display_0, manufacturerPnpId=GGL, productId=1, modelYear=null, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, removeMode 0, refreshRateOverride 0.0, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
                 + "    mRequestedMinimalPostProcessing=false\n"
                 + "    mFrameRateOverrides=[]\n"
                 + "    mPendingFrameRateOverrideUids={}\n";