commit d925ec65dcb6abd855225302d7b4a34095c9901d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 11 11:08:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 11 11:08:22 2024 +0000
tree 005e33e271bca039b0ab5f2bcbf656832e0bedf9
parent df17b83ccfa52c58a3821703ee6a26dce2adc369
parent 466d884932c4cb62d841d6fb7c0316eb9b570df8

Merge "Fix clippy::ptr-arg lint" into main

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index befb5d4..c501921 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -4143,14 +4143,14 @@
 }
 
 int read_file_as_long(const char *path, long int *output) {
-    int fd = TEMP_FAILURE_RETRY(open(path, O_RDONLY | O_NONBLOCK | O_CLOEXEC));
-    if (fd < 0) {
+    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path, O_RDONLY | O_NONBLOCK | O_CLOEXEC)));
+    if (fd.get() < 0) {
         int err = errno;
         MYLOGE("Error opening file descriptor for %s: %s\n", path, strerror(err));
         return -1;
     }
     char buffer[50];
-    ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fd, buffer, sizeof(buffer)));
+    ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fd.get(), buffer, sizeof(buffer)));
     if (bytes_read == -1) {
         MYLOGE("Error reading file %s: %s\n", path, strerror(errno));
         return -2;

libs/input/Android.bp

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index b74c3b2..252040d 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -153,6 +153,10 @@
     ],
     generated_sources: ["libinput_cxx_bridge_code"],
 
+    lto: {
+        never: true,
+    },
+
     shared_libs: [
         "libbase",
     ],