commit 6e8a31191ae1e0ef3d04c042443ab5b8a774d279
author jicheol.shin <jicheol.shin@lge.com> Fri Jun 12 20:01:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 12 20:01:46 2020 +0000
tree 67fa2d8b0a254336b7b9b5f5857be00e3845d716
parent e316a627cfeed795c99f842dfdd99ed0d126f6a2
parent d1a977b77169f4997c54657136f2698395014eca

Fix issues for Japan model. am: c1e9656422 am: 4597fcc545 am: d1a977b771

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1318339

Change-Id: I03ff4595a9c922e483fc89fbe4b15c4328bdd027

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 33347c5..42f6916 100644
--- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
@@ -24,6 +24,9 @@
     /* Record the sim card state for the testing environment */
     CardState cardStateForTest = cardStatus.cardState;
 
+#if 0
+    /* This test has to be removed for Japan Model.
+     * After "setSimCardPower power down", Japan model can not "setSimCardPower power up" */
     /* Test setSimCardPower power down */
     serial = GetRandomSerialNumber();
     radio_v1_1->setSimCardPower_1_1(serial, CardPowerState::POWER_DOWN);
@@ -56,6 +59,7 @@
     ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error,
                                  {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,
                                   RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE}));
+#endif
 
     /**
      * If the sim card status for the testing environment is PRESENT,