| commit | 7063ed4b46dec6285ba8d425e77e9885a2182b49 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Wed Sep 11 21:37:14 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 21:37:14 2019 -0700 |
| tree | 078853afcc78ca96bb93d4586b59d9249ad11e5a | |
| parent | 4d3b73ee5e72070af8352bb59f1ab2b8e89b3f73 [diff] | |
| parent | 5cfbc4ba16c729459f75843ee61ec45b69e9eba2 [diff] |
[automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16 Change-Id: I73333d50cf52fd9e9a2a429587d78ebc85dd82fe
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