| commit | a7e9173c1c785ed1ab0f090b3c9afabf8a422ee2 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 07 00:49:06 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 07 00:49:06 2019 +0000 |
| tree | 54d5ebe8625e9e69273e5220cfe953409efec005 | |
| parent | 7391aceb4a58e81c39f91b9fdcfa62687ed47dc3 [diff] | |
| parent | 09a1eeda83c7c4e6743cddf96f5675e019c13e90 [diff] |
[automerger skipped] DO NOT MERGE: audio: Skip tests if audio HAL service lacks "primary" device am: f045e6b10d -s ours am: 09a1eeda83 Change-Id: Iae663aeed7f1e87208a770748e46a2df6bc2e5e7
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