| commit | 55faeb6c6bac64a1ae10ae299f32a01ae349f134 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Fri Jun 12 22:55:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 22:55:19 2020 +0000 |
| tree | b88b48e3ab92a9816735758b1e961ae3e426148e | |
| parent | 413cad430aa8eee0520175d7fd2b520a8bf00288 [diff] | |
| parent | f821a8a8cf35be2a860b41b8886ff31679fef1b1 [diff] |
Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177cec am: f821a8a8cf Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11855078 Change-Id: I0e9f7f96cc7bc5fe3d10aed52a4ba5362e1deca8
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 87c1e4c..08121fd 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
@@ -49,7 +49,6 @@ } EXPECT_EQ(CardState::ABSENT, cardStatus.cardState); } -#endif /* Test setSimCardPower power up */ serial = GetRandomSerialNumber();