| commit | 84cd010990ae801b94fe16653fcd3a5cd6073c5a | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Mon Sep 09 22:04:42 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 09 22:04:42 2019 -0700 |
| tree | e64504e669ee3325127c17b29db7e48532072789 | |
| parent | e3d5eefd71f75656005017d5b6866b22c8a652a0 [diff] | |
| parent | 955548eec17dd424123c81da35f01300c3511b2b [diff] |
[automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history Change-Id: I123f0bbd4f2fd3ada053deed69f588cc7132b6b8
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