| commit | f821a8a8cf35be2a860b41b8886ff31679fef1b1 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Fri Jun 12 22:41:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 22:41:48 2020 +0000 |
| tree | b88b48e3ab92a9816735758b1e961ae3e426148e | |
| parent | 4961b292accfe5a53a535d8b782d45d86147074e [diff] | |
| parent | 2482177cec501680f6bcbc332ec90205b61ce542 [diff] |
Merge "Fix bad merge of aosp/1220298" into rvc-dev am: 2482177cec Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11855078 Change-Id: Iefd5b0009703104c2cad1adad49511e243db535c
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();