commit e7be8dbbaf32c4fe5af35b6879a05459c5691a49
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 04 19:29:40 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 04 19:29:40 2022 +0000
tree 2e3d3ea15857ec54a3d5c366994aafb3e6c271d3
parent 199d4beabda76e1c7eab5efac3b73a304eb6a978
parent 1133efb9592b91fd0eceae38163aa4194f1cbe98

Merge "Adding min_sdk version to the sdk version"

keystore2/aidl/Android.bp

diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp
index c6f9de7..eaa70b9 100644
--- a/keystore2/aidl/Android.bp
+++ b/keystore2/aidl/Android.bp
@@ -25,7 +25,6 @@
     backend: {
         java: {
             platform_apis: true,
-            srcs_available: true,
         },
         ndk: {
             vndk: {

suspend/1.0/default/WakeLockEntryList.cpp

diff --git a/suspend/1.0/default/WakeLockEntryList.cpp b/suspend/1.0/default/WakeLockEntryList.cpp
index 5443e62..d0bb1ce 100644
--- a/suspend/1.0/default/WakeLockEntryList.cpp
+++ b/suspend/1.0/default/WakeLockEntryList.cpp
@@ -219,7 +219,13 @@
     unique_fd wakelockFd{TEMP_FAILURE_RETRY(
         openat(mKernelWakelockStatsFd, kwlId.c_str(), O_DIRECTORY | O_CLOEXEC | O_RDONLY))};
     if (wakelockFd < 0) {
-        PLOG(ERROR) << "Error opening kernel wakelock stats for: " << kwlId;
+        char buf[PATH_MAX];
+        ssize_t data_length =
+            readlinkat(mKernelWakelockStatsFd, kwlId.c_str(), buf, sizeof(buf) - 1);
+        if (data_length <= 0 || strncmp(kwlId.c_str(), buf, kwlId.length()) == 0) {
+            buf[0] = '\0';
+        }
+        PLOG(ERROR) << "Error opening kernel wakelock stats for: " << kwlId << " (" << buf << ")";
     }
 
     std::unique_ptr<DIR, decltype(&closedir)> wakelockDp(fdopendir(dup(wakelockFd.get())),