Merge "Revert "libsnapshot: set thread priority"" into main am: 35bd4d8f30

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3128361

Change-Id: I4109dc8c87570fdd7bbdb189fa4368ac67c632af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
index 0f4674c..bd7eaca 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
@@ -577,10 +577,8 @@
         SNAP_LOG(ERROR) << "Merge terminated early...";
         return true;
     }
-    auto merge_thread_priority = android::base::GetUintProperty<uint>(
-            "ro.virtual_ab.merge_thread_priority", ANDROID_PRIORITY_BACKGROUND);
 
-    if (!SetThreadPriority(merge_thread_priority)) {
+    if (!SetThreadPriority(ANDROID_PRIORITY_BACKGROUND)) {
         SNAP_PLOG(ERROR) << "Failed to set thread priority";
     }
 
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
index 35a1621..d40b6d1 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
@@ -17,10 +17,8 @@
 #include <libsnapshot/cow_format.h>
 #include <pthread.h>
 
-#include "android-base/properties.h"
 #include "read_worker.h"
 #include "snapuserd_core.h"
-#include "user-space-merge/worker.h"
 #include "utility.h"
 
 namespace android {
@@ -261,10 +259,8 @@
     SNAP_LOG(INFO) << "Processing snapshot I/O requests....";
 
     pthread_setname_np(pthread_self(), "ReadWorker");
-    auto worker_thread_priority = android::base::GetUintProperty<uint>(
-            "ro.virtual_ab.worker_thread_priority", ANDROID_PRIORITY_NORMAL);
 
-    if (!SetThreadPriority(worker_thread_priority)) {
+    if (!SetThreadPriority(ANDROID_PRIORITY_NORMAL)) {
         SNAP_PLOG(ERROR) << "Failed to set thread priority";
     }