From 6a35b57e2a613aeba6d2ccae5e76a2d2679411b8 Mon Sep 17 00:00:00 2001
From: Angel Gallego Vargas <agallego@fb.com>
Date: Mon, 2 Apr 2018 15:23:08 -0700
Subject: [PATCH] Fix logcat-json command to honor adb parameters

Since adb parameters are not forwarded, options
like -d/-e are not working and logcat-json
refures to work when more than one device
is connected at the same time
---
 cmd_logcat_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd_logcat_json.c b/cmd_logcat_json.c
index 149671e..d5747fa 100644
--- a/cmd_logcat_json.c
+++ b/cmd_logcat_json.c
@@ -197,7 +197,7 @@ logcat_json_main(const struct cmd_logcat_json_info* info)
     struct strlist* args = strlist_new();
     strlist_append(args, orig_argv0);
     strlist_append(args, "shell");
-    strlist_xfer(args, make_args_cmd_shell(CMD_ARG_FORWARDED, &shcmdi));
+    strlist_xfer(args, make_args_cmd_shell(CMD_ARG_ALL, &shcmdi));
 
     struct child_start_info csi = {
         .io[STDIN_FILENO] = CHILD_IO_DEV_NULL,