commit | 32ecb053a9fd6b0d4d7fc5a8c60d4a5b2fc3c1ce | [log] [tgz] |
---|---|---|
author | Anthony Stange <stange@google.com> | Thu Aug 29 10:34:49 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 29 10:34:49 2019 -0700 |
tree | 9a1fb7b11dff066875252bb8aba33f328a5a491e | |
parent | 75c50faa51717fb63def62c624ead5e6a9854006 [diff] | |
parent | eac8d9acc9ec09f9783c7a2f5360e56b132c5b1e [diff] |
[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history Change-Id: I02fe7d1fe9f6068432723a3812a7b7a5a6f6bcbd
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