diff --git a/aosp/frameworks/native/data/etc/android.hardware.bluetooth.xml b/aosp/frameworks/native/data/etc/android.hardware.bluetooth.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d681c84d448757bcc28fdc9375a471b02898949
--- /dev/null
+++ b/aosp/frameworks/native/data/etc/android.hardware.bluetooth.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/aosp/frameworks/native/data/etc/android.hardware.bluetooth_le.xml b/aosp/frameworks/native/data/etc/android.hardware.bluetooth_le.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b46e85c0286e7b7f2694e17f0522e9e065f4757f
--- /dev/null
+++ b/aosp/frameworks/native/data/etc/android.hardware.bluetooth_le.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/aosp/frameworks/native/data/etc/handheld_core_hardware.xml b/aosp/frameworks/native/data/etc/handheld_core_hardware.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a45ced6d199c21b131bd4dd336ee0affcb2d0c75
--- /dev/null
+++ b/aosp/frameworks/native/data/etc/handheld_core_hardware.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/aosp/hardware/google/camera/devices/EmulatedCamera/hwl/GrallocSensorBuffer.cpp b/aosp/hardware/google/camera/devices/EmulatedCamera/hwl/GrallocSensorBuffer.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3e4880d4ebc43a4877de26011186d5ffa147cd89
--- /dev/null
+++ b/aosp/hardware/google/camera/devices/EmulatedCamera/hwl/GrallocSensorBuffer.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "GrallocSensorBuffer.h"
+
+namespace android {
+
+GrallocSensorBuffer::~GrallocSensorBuffer() {
+ if (stream_buffer.buffer != nullptr) {
+ int release_fence = importer_->unlock(stream_buffer.buffer);
+ if (release_fence >= 0) {
+ importer_->closeFence(release_fence);
+ }
+ }
+
+ if (acquire_fence_fd >= 0) {
+ importer_->closeFence(acquire_fence_fd);
+ }
+
+ if ((stream_buffer.status != BufferStatus::kOk) &&
+ (callback.notify != nullptr) && (!is_failed_request)) {
+ NotifyMessage msg = {
+ .type = MessageType::kError,
+ .message.error = {.frame_number = frame_number,
+ .error_stream_id = stream_buffer.stream_id,
+ .error_code = ErrorCode::kErrorBuffer}};
+ callback.notify(pipeline_id, msg);
+ }
+
+ if (callback.process_pipeline_result != nullptr) {
+ auto result = std::make_unique();
+ result->camera_id = camera_id;
+ result->pipeline_id = pipeline_id;
+ result->frame_number = frame_number;
+ result->partial_result = 0;
+
+ stream_buffer.acquire_fence = stream_buffer.release_fence = nullptr;
+ if (is_input) {
+ result->input_buffers.push_back(stream_buffer);
+ } else {
+ result->output_buffers.push_back(stream_buffer);
+ }
+ callback.process_pipeline_result(std::move(result));
+ }
+}
+
+} // namespace android
diff --git a/aosp/system/vold/Utils.cpp b/aosp/system/vold/Utils.cpp
index a6d065c6ea5e1a4870da273fbc24cfd0193ea201..2e803715c4bdb03acc55aae3e2c679f4c34596a6 100644
--- a/aosp/system/vold/Utils.cpp
+++ b/aosp/system/vold/Utils.cpp
@@ -245,10 +245,10 @@ int SetQuotaProjectId(const std::string& path, long projectId) {
fsx.fsx_projid = projectId;
ret = ioctl(fd, FS_IOC_FSSETXATTR, &fsx);
- if (ret == -1) {
- PLOG(ERROR) << "Failed to set project id on " << path;
- // return ret;
- }
+ // if (ret == -1) {
+ // PLOG(ERROR) << "Failed to set project id on " << path;
+ // return ret;
+ // }
return 0;
}
diff --git a/aosp/vendor/common/etc/handheld_core_hardware.xml b/aosp/vendor/common/etc/handheld_core_hardware.xml
index fa5d64eb343b1cf0a03fc8c2e3e27bb363214b38..3364f22b13f14106f83666372320df8ae1990b98 100644
--- a/aosp/vendor/common/etc/handheld_core_hardware.xml
+++ b/aosp/vendor/common/etc/handheld_core_hardware.xml
@@ -23,8 +23,8 @@
-
-
+
+