Snap for 12478163 from ca75558392385f781c1f47525613cd9ba786ce9e to 25Q1-release
Change-Id: I1c5f8e9cb2123ee40e4b296f5ef70748be7ac0ba
diff --git a/Android.bp b/Android.bp
index 2578188..76e7b11 100644
--- a/Android.bp
+++ b/Android.bp
@@ -192,7 +192,7 @@
],
shared_libs: [
- "android.hardware.graphics.composer3-V3-ndk",
+ "android.hardware.graphics.composer3-V4-ndk",
"libbase",
"libbinder_ndk",
"liblog",
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..1f413f7
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,3 @@
+[Hook Scripts]
+
+check hooks installed = hooks/check-hooks-installed
\ No newline at end of file
diff --git a/hooks/check-hooks-installed b/hooks/check-hooks-installed
new file mode 100755
index 0000000..45e5c73
--- /dev/null
+++ b/hooks/check-hooks-installed
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Gerrit hook that runs on repo upload. Checks to ensure that the pre-upload hook
+# has been installed.
+
+cmd=$(git config hookcmd.check-non-public-commits.command)
+if [ -z "$cmd" ]; then
+ echo "Please install hooks by running: hooks/install-hooks.sh"
+ exit 1
+fi
\ No newline at end of file
diff --git a/hooks/check-non-public-commits b/hooks/check-non-public-commits
new file mode 100755
index 0000000..fc20795
--- /dev/null
+++ b/hooks/check-non-public-commits
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# git pre-push hook to detect whether a developer is attempting to push
+# non-public commits to a public repository.
+
+remote="$1"
+url="$2"
+
+# Don't bother checking if this is being pushed to gerrit.
+if [[ "$url" = "sso://googleplex-android/platform/external/drm_hwcomposer" ]] ||
+ [[ "$url" = "sso://android.googlesource.com/platform/external/drm_hwcomposer" ]]
+then
+ exit 0
+fi
+
+while read local_ref local_sha remote_ref remote_sha
+do
+ # Gather a list of all commits that are to be pushed to the remote.
+ # remote_sha will be 000000 if there is no corresponding remote branch.
+ if [[ "$remote_sha" =~ "0000000000" ]]; then
+ commits=$(git rev-list $local_sha --not --remotes=$remote)
+ else
+ commits=$(git rev-list $remote_sha..$local_sha)
+ fi
+
+ # Check each commit message for the prohibited prefix.
+ for commit in $commits; do
+ # Get the commit message.
+ message=$(git log -1 --pretty=%B $commit)
+
+ # Check if the commit message starts with "ANDROID:"
+ if [[ "$message" == "ANDROID"* ]] ||
+ [[ "$message" == "INTERNAL"* ]] ||
+ [[ "$message" == "DO NOT MERGE"* ]]; then
+ echo "Error: Commit message starts with downstream tag:"
+ echo "$message"
+ echo "It looks like you're trying to push internal changes to an externally "
+ echo "visible repository: $url"
+ exit 1
+ fi
+ done
+done
+
+exit 0
diff --git a/hooks/install-hooks.sh b/hooks/install-hooks.sh
new file mode 100755
index 0000000..d19a3c8
--- /dev/null
+++ b/hooks/install-hooks.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Install hooks.
+git config --add hookcmd.check-non-public-commits.command hooks/check-non-public-commits
+git config --add hook.pre-push.command check-non-public-commits
\ No newline at end of file
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index f353abb..0736662 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -332,6 +332,9 @@
if (command.brightness) {
ExecuteSetLayerBrightness(display_id, layer_wrapper, *command.brightness);
}
+ if (command.luts) {
+ ExecuteLayerCommandSetLayerLuts(display_id, layer_wrapper, *command.luts);
+ }
// Some unsupported functionality returns kUnsupported, and others
// are just a no-op.
@@ -1132,6 +1135,12 @@
}
}
+void ComposerClient::ExecuteLayerCommandSetLayerLuts(
+ int64_t /*display_id*/, HwcLayerWrapper& /*layer*/,
+ const std::vector<std::optional<Lut>>& /*luts*/) {
+ cmd_result_writer_->AddError(hwc3::Error::kUnsupported);
+}
+
void ComposerClient::ExecuteSetDisplayBrightness(
uint64_t display_id, const DisplayBrightness& command) {
auto* display = GetDisplay(display_id);
diff --git a/hwc3/ComposerClient.h b/hwc3/ComposerClient.h
index f6362ad..41c011c 100644
--- a/hwc3/ComposerClient.h
+++ b/hwc3/ComposerClient.h
@@ -20,6 +20,7 @@
#include "aidl/android/hardware/graphics/composer3/BnComposerClient.h"
#include "aidl/android/hardware/graphics/composer3/LayerCommand.h"
+#include <aidl/android/hardware/graphics/composer3/Lut.h>
#include "hwc3/CommandResultWriter.h"
#include "hwc3/ComposerResources.h"
#include "hwc3/Utils.h"
@@ -178,6 +179,8 @@
const ZOrder& z_order);
void ExecuteSetLayerBrightness(int64_t display_id, HwcLayerWrapper& layer,
const LayerBrightness& brightness);
+ void ExecuteLayerCommandSetLayerLuts(int64_t display_id, HwcLayerWrapper& layer,
+ const std::vector<std::optional<Lut>>& luts);
// Display commands
void ExecuteDisplayCommand(const DisplayCommand& command);
diff --git a/hwc3/hwc3-drm.xml b/hwc3/hwc3-drm.xml
index 911f7f8..7debcf9 100644
--- a/hwc3/hwc3-drm.xml
+++ b/hwc3/hwc3-drm.xml
@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.graphics.composer3</name>
- <version>3</version>
+ <version>4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>