Revert "libbinder: Replace deprecated utils/threads.h header"

This reverts commit bc8d5b4830d7fb5afe52f9d8809212babedd72b1.

Reason for revert: breaks libvrflinger build

Change-Id: I767dbf3ed56893ead497184d2204a04156faaa9d

12 files changed, 17 insertions, 8 deletions

diff --git a/libs/binder/BufferedTextOutput.h b/libs/binder/BufferedTextOutput.h
index 57e03cb3a6..fdd532aec6 100644
--- a/libs/binder/BufferedTextOutput.h
+++ b/libs/binder/BufferedTextOutput.h
@@ -18,8 +18,8 @@
 #define ANDROID_BUFFEREDTEXTOUTPUT_H
 
 #include <binder/TextOutput.h>
+#include <utils/threads.h>
 #include <sys/uio.h>
-#include <utils/Mutex.h>
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp
index d0cb1f3fb9..bd974b02b1 100644
--- a/libs/binder/IMemory.cpp
+++ b/libs/binder/IMemory.cpp
@@ -32,7 +32,7 @@
 #include <log/log.h>
 
 #include <utils/KeyedVector.h>
-#include <utils/Mutex.h>
+#include <utils/threads.h>
 
 #define VERBOSE   0
 
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 4d85c976b3..13f0a4c4a5 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -27,6 +27,7 @@
 #include <utils/CallStack.h>
 #include <utils/Log.h>
 #include <utils/SystemClock.h>
+#include <utils/threads.h>
 
 #include <atomic>
 #include <errno.h>
diff --git a/libs/binder/MemoryDealer.cpp b/libs/binder/MemoryDealer.cpp
index 03553f36e9..c4475c7780 100644
--- a/libs/binder/MemoryDealer.cpp
+++ b/libs/binder/MemoryDealer.cpp
@@ -23,6 +23,7 @@
 #include <utils/Log.h>
 #include <utils/SortedVector.h>
 #include <utils/String8.h>
+#include <utils/threads.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index 27d1165e56..1821729cfa 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -24,10 +24,9 @@
 #include <binder/IServiceManager.h>
 #include <binder/Stability.h>
 #include <cutils/atomic.h>
-#include <utils/AndroidThreads.h>
 #include <utils/Log.h>
 #include <utils/String8.h>
-#include <utils/Thread.h>
+#include <utils/threads.h>
 
 #include "Static.h"
 #include "binder_module.h"
diff --git a/libs/binder/Static.h b/libs/binder/Static.h
index 8444fe780c..83524e8575 100644
--- a/libs/binder/Static.h
+++ b/libs/binder/Static.h
@@ -17,6 +17,8 @@
 // All static variables go here, to control initialization and
 // destruction order in the library.
 
+#include <utils/threads.h>
+
 #include <binder/IBinder.h>
 #include <binder/ProcessState.h>
 
diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h
index 6089f1c6be..c0454b6fbd 100644
--- a/libs/binder/include/binder/BpBinder.h
+++ b/libs/binder/include/binder/BpBinder.h
@@ -19,6 +19,7 @@
 #include <binder/IBinder.h>
 #include <utils/KeyedVector.h>
 #include <utils/Mutex.h>
+#include <utils/threads.h>
 
 #include <unordered_map>
 #include <variant>
diff --git a/libs/binder/include/binder/PermissionController.h b/libs/binder/include/binder/PermissionController.h
index 6f9eb5e4b9..e65857417b 100644
--- a/libs/binder/include/binder/PermissionController.h
+++ b/libs/binder/include/binder/PermissionController.h
@@ -19,7 +19,8 @@
 #ifndef __ANDROID_VNDK__
 
 #include <binder/IPermissionController.h>
-#include <utils/Mutex.h>
+
+#include <utils/threads.h>
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/libs/binder/include/binder/ProcessState.h b/libs/binder/include/binder/ProcessState.h
index 104b70aff0..cf8d8e433c 100644
--- a/libs/binder/include/binder/ProcessState.h
+++ b/libs/binder/include/binder/ProcessState.h
@@ -18,10 +18,11 @@
 
 #include <binder/IBinder.h>
 #include <utils/KeyedVector.h>
-#include <utils/Mutex.h>
 #include <utils/String16.h>
 #include <utils/String8.h>
 
+#include <utils/threads.h>
+
 #include <pthread.h>
 
 // ---------------------------------------------------------------------------
diff --git a/libs/binder/include_activitymanager/binder/ActivityManager.h b/libs/binder/include_activitymanager/binder/ActivityManager.h
index abc7f1d374..b772b80227 100644
--- a/libs/binder/include_activitymanager/binder/ActivityManager.h
+++ b/libs/binder/include_activitymanager/binder/ActivityManager.h
@@ -18,9 +18,10 @@
 
 #ifndef __ANDROID_VNDK__
 
-#include <android/app/ProcessStateEnum.h>
 #include <binder/IActivityManager.h>
-#include <utils/Mutex.h>
+#include <android/app/ProcessStateEnum.h>
+
+#include <utils/threads.h>
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/libs/binder/tests/unit_fuzzers/BpBinderFuzzFunctions.h b/libs/binder/tests/unit_fuzzers/BpBinderFuzzFunctions.h
index 5079431058..741987f754 100644
--- a/libs/binder/tests/unit_fuzzers/BpBinderFuzzFunctions.h
+++ b/libs/binder/tests/unit_fuzzers/BpBinderFuzzFunctions.h
@@ -30,6 +30,7 @@
 #include <utils/KeyedVector.h>
 #include <utils/Log.h>
 #include <utils/Mutex.h>
+#include <utils/threads.h>
 
 #include <stdio.h>
 
diff --git a/libs/binder/tests/unit_fuzzers/IBinderFuzzFunctions.h b/libs/binder/tests/unit_fuzzers/IBinderFuzzFunctions.h
index bf7c61347f..4a0aebac43 100644
--- a/libs/binder/tests/unit_fuzzers/IBinderFuzzFunctions.h
+++ b/libs/binder/tests/unit_fuzzers/IBinderFuzzFunctions.h
@@ -27,6 +27,7 @@
 #include <utils/KeyedVector.h>
 #include <utils/Log.h>
 #include <utils/Mutex.h>
+#include <utils/threads.h>
 
 namespace android {