From: 胡传军 <1224667075@qq.com>
Date: Sat, 21 Sep 2024 11:17:12 +0000 (+0000)
Subject: Merge #1002 into sdk602patch0626 from refs/changes/1002/head
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8a92935f0080c32c6a958e9bd1eecb81d1a0fa6d;p=mirrors%2FFD230.git

Merge #1002 into sdk602patch0626 from refs/changes/1002/head

Code review from 胡传军

* refs/changes/1002/head: (6 commits squashed)

  - 修复同步实时运动数据存在的BUG

  - 蓝牙文件取消传输修改

  - 电话bug综合修复

  - 电话bug综合修复(补)

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

  - 修复电话死机问题

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1002
---

diff --git a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
index e88cdfdde..56cea10b6 100755
--- a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
+++ b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
@@ -161,9 +161,17 @@ public:
     }
 
     bool make_phone_push(uint16_t preSlice) { 
-        uint8_t top_id= backStack_.top();
-        if(top_id!=preSlice)
-        backStack_.push(preSlice);
+        if(backStack_.empty())
+        {
+            backStack_.push(preSlice);
+        }
+        else
+        {
+            uint8_t top_id= backStack_.top();
+            if(top_id!=preSlice)
+            backStack_.push(preSlice);
+        }
+       
         return false;
     }