Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50923069 authored by Xin Li's avatar Xin Li
Browse files

Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master 

Bug: 111615259
Change-Id: If05ea0b23b2eaf71d67380747bb8903b060d9ffc
parents eb7c6344 f409d95f

audio/effect/2.0/xml/audio_effects_conf_V2_0.xsd

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ 
      <xs:field xpath="@library"/>

    </xs:keyref>

    <xs:key name="effectName">

      <xs:selector xpath="aec:effects/aec:effect"/>

      <xs:selector xpath="aec:effects/aec:effect|aec:effects/aec:effectProxy"/>

      <xs:field xpath="@name"/>

    </xs:key>

    <xs:keyref name="effectNamePreRef" refer="aec:effectName">

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+8 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ using ::android::hardware::camera::device::V3_2::ICameraDevice; 
using ::android::hardware::camera::device::V3_2::BufferCache;

using ::android::hardware::camera::device::V3_2::CaptureRequest;

using ::android::hardware::camera::device::V3_2::CaptureResult;

using ::android::hardware::camera::device::V3_2::ICameraDeviceCallback;

using ::android::hardware::camera::device::V3_2::ICameraDeviceSession;

using ::android::hardware::camera::device::V3_2::NotifyMsg;

using ::android::hardware::camera::device::V3_2::RequestTemplate;
@@ -532,7 +531,7 @@ public: 


 hidl_vec<hidl_string> getCameraDeviceNames(sp<ICameraProvider> provider);



 struct EmptyDeviceCb : public ICameraDeviceCallback {

 struct EmptyDeviceCb : public V3_4::ICameraDeviceCallback {

     virtual Return<void> processCaptureResult(

         const hidl_vec<CaptureResult>& /*results*/) override {

         ALOGI("processCaptureResult callback");
@@ -540,6 +539,13 @@ public: 
         return Void();

     }



     virtual Return<void> processCaptureResult_3_4(

         const hidl_vec<V3_4::CaptureResult>& /*results*/) override {

         ALOGI("processCaptureResult_3_4 callback");

         ADD_FAILURE();  // Empty callback should not reach here

         return Void();

     }



     virtual Return<void> notify(const hidl_vec<NotifyMsg>& /*msgs*/) override {

         ALOGI("notify callback");

         ADD_FAILURE();  // Empty callback should not reach here