commit a8b8b6b1b3548be1e0604f261e4f71e85596ee64
author sqian <shuoq@google.com> Tue Aug 14 12:30:57 2018 -0700
committer Shuo Qian <shuoq@google.com> Wed Aug 15 05:49:52 2018 +0000
tree 12a5e163d76505e486b7de1513acef70430f52e1
parent c1db4227234aa3c85ef59e03df360bb54f0d0bcf

Patch for setSimCardPower_1_1

Do not expect its affect on cardStatus if it is not successfully returned.
Check the response error before updating sim card status.

Test: sanity
Bug: 111661946
Change-Id: I48551f5469289b9fcfc47dd9fd2e455779640329
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
(cherry picked from commit 7e787e192cd4700d8f4e7cc5f55501bc37590245)

radio/1.1/vts/functional/radio_hidl_hal_api.cpp

diff --git a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
index 40759a6..33347c5 100644
--- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
@@ -33,17 +33,17 @@
     ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error,
                                  {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,
                                   RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE}));
-    /* Wait some time for setting sim power down and then verify it */
-    updateSimCardStatus();
-    auto startTime = std::chrono::system_clock::now();
-    while (cardStatus.cardState != CardState::ABSENT &&
+    if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) {
+        /* Wait some time for setting sim power down and then verify it */
+        updateSimCardStatus();
+        auto startTime = std::chrono::system_clock::now();
+        while (cardStatus.cardState != CardState::ABSENT &&
            std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - startTime)
                    .count() < 80) {
-        /* Set 2 seconds as interval to check card status */
-        sleep(2);
-        updateSimCardStatus();
-    }
-    if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) {
+            /* Set 2 seconds as interval to check card status */
+            sleep(2);
+            updateSimCardStatus();
+        }
         EXPECT_EQ(CardState::ABSENT, cardStatus.cardState);
     }
 
@@ -65,7 +65,7 @@
         radioRsp_v1_1->rspInfo.error == RadioError::NONE) {
         /* Wait some time for resetting back to sim power on and then verify it */
         updateSimCardStatus();
-        startTime = std::chrono::system_clock::now();
+        auto startTime = std::chrono::system_clock::now();
         while (cardStatus.cardState != CardState::PRESENT &&
                std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() -
                                                            startTime)