From 43e844c1420296900f4e26253d389623ee0a0d30 Mon Sep 17 00:00:00 2001
From: Rodrigo Maafs Atilano <rodrigoelmaps@gmail.com>
Date: Fri, 24 Sep 2021 19:04:14 -0500
Subject: [PATCH 1/3] Fix unknown command

---
 packages/platform-android/src/commands/runAndroid/adb.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/platform-android/src/commands/runAndroid/adb.ts b/packages/platform-android/src/commands/runAndroid/adb.ts
index b628ac0ad..b55ac0f87 100644
--- a/packages/platform-android/src/commands/runAndroid/adb.ts
+++ b/packages/platform-android/src/commands/runAndroid/adb.ts
@@ -34,6 +34,11 @@ function parseDevicesResult(result: string): Array<string> {
  */
 function getDevices(adbPath: string): Array<string> {
   try {
+    //If the path includes spaces (for example, the name of the USER_NAME) in Windows...
+    if (adbPath.includes(' ') && process.platform.startsWith('win')) {
+      adbPath = `"${adbPath}"`;
+    }
+
     const devicesResult = execSync(`${adbPath} devices`);
     return parseDevicesResult(devicesResult.toString());
   } catch (e) {

From 22bbdd1a7acd535163605195328f2d59ca64175b Mon Sep 17 00:00:00 2001
From: Efren Peredo <efren@appscamelot.com>
Date: Fri, 5 Nov 2021 12:22:40 -0600
Subject: [PATCH 2/3] Tested on mac

---
 packages/platform-android/src/commands/runAndroid/adb.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/platform-android/src/commands/runAndroid/adb.ts b/packages/platform-android/src/commands/runAndroid/adb.ts
index b55ac0f87..759626f86 100644
--- a/packages/platform-android/src/commands/runAndroid/adb.ts
+++ b/packages/platform-android/src/commands/runAndroid/adb.ts
@@ -34,8 +34,8 @@ function parseDevicesResult(result: string): Array<string> {
  */
 function getDevices(adbPath: string): Array<string> {
   try {
-    //If the path includes spaces (for example, the name of the USER_NAME) in Windows...
-    if (adbPath.includes(' ') && process.platform.startsWith('win')) {
+    //If the path includes spaces (for example, the name of the USER_NAME)
+    if (adbPath.includes(' ')) {
       adbPath = `"${adbPath}"`;
     }
 

From d4fd87f90039c6536093454383c19bc69c9ad823 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Mon, 24 Jan 2022 16:39:44 +0100
Subject: [PATCH 3/3] Update adb.ts

---
 packages/platform-android/src/commands/runAndroid/adb.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/platform-android/src/commands/runAndroid/adb.ts b/packages/platform-android/src/commands/runAndroid/adb.ts
index 759626f86..8cd6995de 100644
--- a/packages/platform-android/src/commands/runAndroid/adb.ts
+++ b/packages/platform-android/src/commands/runAndroid/adb.ts
@@ -34,12 +34,7 @@ function parseDevicesResult(result: string): Array<string> {
  */
 function getDevices(adbPath: string): Array<string> {
   try {
-    //If the path includes spaces (for example, the name of the USER_NAME)
-    if (adbPath.includes(' ')) {
-      adbPath = `"${adbPath}"`;
-    }
-
-    const devicesResult = execSync(`${adbPath} devices`);
+    const devicesResult = execSync(`"${adbPath}" devices`);
     return parseDevicesResult(devicesResult.toString());
   } catch (e) {
     return [];