commit c10abf09f7fe6042eab1cc7436e9902d66e6e4e1
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 19 03:04:03 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 19 03:04:03 2017 +0000
tree 33c29286ea06d7a6cd330caab13ae88441a3c948
parent d7e88525a772c001ea24f9250949ef6ac32b59b7
parent f9723eef1ff93c6b1be87fb4553073e2ff6b021f

Merge "Fix test case for setSimCardPower radio api." into oc-dev

radio/1.0/IRadioResponse.hal

diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal
index 2ba210b..fdb5c4e 100644
--- a/radio/1.0/IRadioResponse.hal
+++ b/radio/1.0/IRadioResponse.hal
@@ -1811,7 +1811,6 @@
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:REQUEST_NOT_SUPPORTED
-     *   RadioError:SIM_ABSENT
      *   RadioError:INVALID_ARGUMENTS
      */
     oneway setSimCardPowerResponse(RadioResponseInfo info);

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
index 2e0a10f..825585d 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@ -787,6 +787,7 @@
   EXPECT_EQ(serial, radioRsp->rspInfo.serial);
 
   if (cardStatus.cardState == CardState::ABSENT) {
-    ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
+    ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE
+        || radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
   }
 }
\ No newline at end of file