| commit | 6721304a429bc807be18be360af39b3e4cda7578 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 11 22:27:26 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 11 22:27:26 2019 +0000 |
| tree | 54d5ebe8625e9e69273e5220cfe953409efec005 | |
| parent | a7e9173c1c785ed1ab0f090b3c9afabf8a422ee2 [diff] | |
| parent | 26be76d5855428220f0251db9dd01ebfba043a6e [diff] |
[automerger skipped] Merge "DO NOT MERGE: Audio HAL: do not test input stream if no Built-in mic on primary" into pie-vts-dev am: 356c36b96d -s ours am: 1acfd12deb -s ours am skip reason: subject contains skip directive am: 26be76d585 Change-Id: I4e1afcc3b6c0c19c62c20a21383925bc70549ce0
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