| commit | 6059e56d92b633a3a9426d417f67d2b323edfeb1 | [log] [tgz] |
|---|---|---|
| author | Robert Chou <robertchou@google.com> | Thu Sep 05 12:42:56 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 05 12:42:56 2019 -0700 |
| tree | e64504e669ee3325127c17b29db7e48532072789 | |
| parent | 32ecb053a9fd6b0d4d7fc5a8c60d4a5b2fc3c1ce [diff] | |
| parent | e9e4020560a2a5b5f1756059986d193186708df1 [diff] |
Merge "hostapd: Ignore ACS relate vts testcase for hostapd 1.0 and hostapd 1.1" into qt-dev am: e9e4020560 Change-Id: I738f6f239ba5ad3daea875f760dbb79be129861b
diff --git a/cas/1.1/default/android.hardware.cas@1.1-service-lazy.rc b/cas/1.1/default/android.hardware.cas@1.1-service-lazy.rc index 9227b6f..73c505d 100644 --- a/cas/1.1/default/android.hardware.cas@1.1-service-lazy.rc +++ b/cas/1.1/default/android.hardware.cas@1.1-service-lazy.rc
@@ -1,4 +1,5 @@ service vendor.cas-hal-1-1 /vendor/bin/hw/android.hardware.cas@1.1-service-lazy + interface android.hardware.cas@1.0::IMediaCasService default interface android.hardware.cas@1.1::IMediaCasService default oneshot disabled
diff --git a/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp b/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp index e2fe3f9..39736cc 100644 --- a/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp +++ b/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
@@ -833,4 +833,4 @@ result = gnss_configuration_hal->setBlacklist(sources); ASSERT_TRUE(result.isOk()); EXPECT_TRUE(result); -} +} \ No newline at end of file