| commit | c3460585ec7182aaa1c1fd21ee48e5fd53524f4b | [log] [tgz] |
|---|---|---|
| author | Kevin Rocard <krocard@google.com> | Wed Oct 23 16:22:52 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 23 16:22:52 2019 -0700 |
| tree | 078853afcc78ca96bb93d4586b59d9249ad11e5a | |
| parent | 76d71b6a1890ec5c200ff16f8404718f0ed018ec [diff] | |
| parent | c12907a999000c4950c3e27a66fb213aba49c46f [diff] |
[automerger skipped] Merge "DO NOT MERGE: Audio VTS: Wait after stream close" into pie-vts-dev am: b0a0799f56 -s ours am: f03eb1253b -s ours am: c12907a999 Change-Id: I7d90ad8a7b5469d7e222518c5ccff37089c950af
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