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

Commit 4593b04b authored by Xin Li's avatar Xin Li
Browse files

Merge commit '79edadce' from 

oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I04234f284e3117e8343e7c888646400c81f5a131
Merged-In: Icf228c701afe37dd3c7f00ea9e6fb740b0d450f1
parents ea8dd2c7 79edadce

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ subdirs = [ 
    "camera",

    "drm/*",

    "media/*",

    "radio",

    "services/*",

    "soundtrigger",

]

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libaudiopreprocessing.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmediacodecservice.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libstagefright_xmlparser@1.0.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libstagefright_soft_*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/libstagefright_soft_*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

camera/aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl

+3 −1
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ interface ICameraDeviceCallbacks 
     * Repeating request encountered an error and was stopped.

     *

     * @param lastFrameNumber Frame number of the last frame of the streaming request.

     * @param repeatingRequestId the ID of the repeating request being stopped

     */

    oneway void onRepeatingRequestError(in long lastFrameNumber);

    oneway void onRepeatingRequestError(in long lastFrameNumber,

                                        in int repeatingRequestId);

    oneway void onRequestQueueEmpty();

}

camera/ndk/impl/ACameraDevice.cpp

+5 −2
Original line number Diff line number Diff line
@@ -1372,7 +1372,8 @@ CameraDevice::ServiceCallback::onRequestQueueEmpty() { 
}



binder::Status

CameraDevice::ServiceCallback::onRepeatingRequestError(int64_t lastFrameNumber) {

CameraDevice::ServiceCallback::onRepeatingRequestError(

        int64_t lastFrameNumber, int32_t stoppedSequenceId) {

    binder::Status ret = binder::Status::ok();



    sp<CameraDevice> dev = mDevice.promote();
@@ -1383,7 +1384,9 @@ CameraDevice::ServiceCallback::onRepeatingRequestError(int64_t lastFrameNumber) 
    Mutex::Autolock _l(dev->mDeviceLock);



    int repeatingSequenceId = dev->mRepeatingSequenceId;

    if (stoppedSequenceId == repeatingSequenceId) {

        dev->mRepeatingSequenceId = REQUEST_ID_NONE;

    }



    dev->checkRepeatingSequenceCompleteLocked(repeatingSequenceId, lastFrameNumber);

camera/ndk/impl/ACameraDevice.h

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ class CameraDevice final : public RefBase { 
                              const CaptureResultExtras& resultExtras) override;

        binder::Status onPrepared(int streamId) override;

        binder::Status onRequestQueueEmpty() override;

        binder::Status onRepeatingRequestError(int64_t lastFrameNumber) override;

        binder::Status onRepeatingRequestError(int64_t lastFrameNumber,

                int32_t stoppedSequenceId) override;

      private:

        const wp<CameraDevice> mDevice;

    };