commit a08ebb3086153e764e91b924a72bdfd83f70ba64
author Kamaljeet Maini <kamaljeet@google.com> Wed Feb 09 19:58:56 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 09 19:58:56 2022 +0000
tree 40b5e2b7e726f9f4b36f82a74bedee9c0c0611c5
parent 4a39ba316f775c77b69b438f42352319c64688fe
parent ff9cfac08e11aa58ae470f991a8de298afb45e5b

Merge "Allow disabling AVB on special vbmeta partitions"

libutils/Android.bp

diff --git a/libutils/Android.bp b/libutils/Android.bp
index 234638b..53f6065 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -100,7 +100,6 @@
             cflags: ["-fvisibility=protected"],
 
             shared_libs: [
-                "libprocessgroup",
                 "libvndksupport",
             ],
 

libutils/Threads.cpp

diff --git a/libutils/Threads.cpp b/libutils/Threads.cpp
index a85ff20..4dacdc6 100644
--- a/libutils/Threads.cpp
+++ b/libutils/Threads.cpp
@@ -299,21 +299,16 @@
 int androidSetThreadPriority(pid_t tid, int pri)
 {
     int rc = 0;
-    int lasterr = 0;
     int curr_pri = getpriority(PRIO_PROCESS, tid);
 
     if (curr_pri == pri) {
         return rc;
     }
 
-    if (rc) {
-        lasterr = errno;
-    }
-
     if (setpriority(PRIO_PROCESS, tid, pri) < 0) {
         rc = INVALID_OPERATION;
     } else {
-        errno = lasterr;
+        errno = 0;
     }
 
     return rc;