From e139205a109df4a5b2cde557448c0a99b4c3ce9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= <yuhongzheng@bytedance.com>
Date: Mon, 24 Feb 2025 12:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=89=E7=BA=BF=E4=BB=8D?=
 =?UTF-8?q?=E7=84=B6=E5=AE=89=E8=A3=85=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/gadb/device.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkg/gadb/device.go b/pkg/gadb/device.go
index 17e8358e..808d87ca 100644
--- a/pkg/gadb/device.go
+++ b/pkg/gadb/device.go
@@ -640,16 +640,17 @@ func (d *Device) InstallAPK(apkPath string, args ...string) (string, error) {
 	haserr := func(ret string) bool {
 		return strings.Contains(ret, "Failure")
 	}
-	if d.HasFeature(FeatAbbExec) {
-		raw, err := d.installViaABBExec(apkFile)
-		if err != nil {
-			return "", fmt.Errorf("error installing: %v", err)
-		}
-		if haserr(string(raw)) {
-			return "", errors.New(string(raw))
-		}
-		return string(raw), err
-	}
+	// 该方法掉线不会返回error。导致误认为安装成功
+	//if d.HasFeature(FeatAbbExec) {
+	//	raw, err := d.installViaABBExec(apkFile)
+	//	if err != nil {
+	//		return "", fmt.Errorf("error installing: %v", err)
+	//	}
+	//	if haserr(string(raw)) {
+	//		return "", errors.New(string(raw))
+	//	}
+	//	return string(raw), err
+	//}
 
 	remote := fmt.Sprintf("/data/local/tmp/%s.apk", builtin.GenNameWithTimestamp("gadb_remote_%d"))
 	err = d.Push(apkFile, remote, time.Now())