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

Commit 3be6c7d1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7890423 from 4f9fe84d to tm-release

Change-Id: I2c9ba8ff92e46409d0ad1bd1220f927e137d5c57
parents 5d78c8c4 4f9fe84d
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
// This file is autogenerated by hidl-gen -Landroidbp.

hidl_interface {
    name: "android.hardware.camera.metadata@3.7",
    root: "android.hardware",
    srcs: [
        "types.hal",
    ],
    interfaces: [
        "android.hardware.camera.metadata@3.2",
        "android.hardware.camera.metadata@3.3",
        "android.hardware.camera.metadata@3.4",
        "android.hardware.camera.metadata@3.5",
        "android.hardware.camera.metadata@3.6",
    ],
    gen_java: true,
}
+18 −0
Original line number Diff line number Diff line
// This file is autogenerated by hidl-gen -Landroidbp.

hidl_interface {
    name: "android.hardware.camera.metadata@3.8",
    root: "android.hardware",
    srcs: [
        "types.hal",
    ],
    interfaces: [
        "android.hardware.camera.metadata@3.2",
        "android.hardware.camera.metadata@3.3",
        "android.hardware.camera.metadata@3.4",
        "android.hardware.camera.metadata@3.5",
        "android.hardware.camera.metadata@3.6",
        "android.hardware.camera.metadata@3.7",
    ],
    gen_java: true,
}
+8 −0
Original line number Diff line number Diff line
@@ -58,3 +58,11 @@ enum CameraMetadataTag : @3.7::CameraMetadataTag {
/*
 * Enumeration definitions for the various entries that need them
 */

/** android.control.videoStabilizationMode enumeration values added since v3.2
 * @see ANDROID_CONTROL_VIDEO_STABILIZATION_MODE
 */
enum CameraMetadataEnumAndroidControlVideoStabilizationMode :
        @3.2::CameraMetadataEnumAndroidControlVideoStabilizationMode {
    ANDROID_CONTROL_VIDEO_STABILIZATION_MODE_PREVIEW_STABILIZATION,
};
+0 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ ndk::ScopedAStatus GnssBatching::start(int64_t periodNanos, int flags) {

ndk::ScopedAStatus GnssBatching::flush() {
    ALOGD("flush");
    if (mBatchedLocations.empty()) {
        return ndk::ScopedAStatus::ok();
    }
    std::vector<GnssLocation> copy = std::vector<GnssLocation>(mBatchedLocations);
    ndk::ScopedAStatus status;
    if (sCallback != nullptr) {
+9 −1
Original line number Diff line number Diff line
@@ -88,7 +88,11 @@ void FilterCallbackScheduler::start() {
}

void FilterCallbackScheduler::stop() {
    {
        std::unique_lock<std::mutex> lock(mLock);
        mIsRunning = false;
        mCv.notify_all();
    }
    if (mCallbackThread.joinable()) {
        mCallbackThread.join();
    }
@@ -113,6 +117,10 @@ void FilterCallbackScheduler::threadLoopOnce() {
        // okay to send data.
        mCv.wait(lock);
    }
    if (!mIsRunning) {
        lock.unlock();
        return;
    }

    // condition_variable wait locks mutex on timeout / notify
    if (!mCallbackBuffer.empty()) {