From dd5ba31b634797bfede1d84e1ea737203712bc83 Mon Sep 17 00:00:00 2001
From: "lilong.129" <lilong.129@bytedance.com>
Date: Thu, 19 Sep 2024 10:37:36 +0800
Subject: [PATCH] fix: do not return err if get window orientation failed

---
 hrp/pkg/uixt/android_adb_driver.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go
index 86593969..b2fc98dd 100644
--- a/hrp/pkg/uixt/android_adb_driver.go
+++ b/hrp/pkg/uixt/android_adb_driver.go
@@ -117,15 +117,17 @@ func (ad *adbDriver) WindowSize() (size Size, err error) {
 		ad.windowSize = &size
 	}
 
-	orientation, err := ad.Orientation()
-	if err != nil {
-		log.Warn().Err(err).Msgf("window size get orientation failed, use default orientation")
+	orientation, err2 := ad.Orientation()
+	if err2 != nil {
 		orientation = OrientationPortrait
+		log.Warn().Err(err2).Msgf(
+			"get window orientation failed, use default %s", orientation)
 	}
 	if orientation != OrientationPortrait {
 		size.Width, size.Height = size.Height, size.Width
 	}
-	return
+	// Notice: do not return err if get window orientation failed
+	return size, nil
 }
 
 func (ad *adbDriver) Screen() (screen Screen, err error) {