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

Commit 3b4a1d7e authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE: Merge Oreo MR1 into master 

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I6925bf21b9b25e85bd5146c28ec3d4985b1ea852
parents 63131439 6c11077d

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/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ cc_library_shared { 


}



// AIDL interface between libcamera_client and framework.jar.

// AIDL interface between camera clients and the camera service.

filegroup {

    name: "libcamera_client_aidl",

    srcs: [

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);