AIDL BufferPool implementation (HIDL -> AIDL)

Bug: 254050250
Test: m
Change-Id: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
diff --git a/media/bufferpool/aidl/default/tests/multi.cpp b/media/bufferpool/aidl/default/tests/multi.cpp
index 43b0a8c..8806eb0 100644
--- a/media/bufferpool/aidl/default/tests/multi.cpp
+++ b/media/bufferpool/aidl/default/tests/multi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2022 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,34 +18,35 @@
 
 #include <gtest/gtest.h>
 
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+#include <android/binder_stability.h>
 #include <android-base/logging.h>
-#include <binder/ProcessState.h>
-#include <bufferpool/ClientManager.h>
-#include <hidl/HidlSupport.h>
-#include <hidl/HidlTransportSupport.h>
-#include <hidl/LegacySupport.h>
-#include <hidl/Status.h>
+#include <bufferpool2/ClientManager.h>
+
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+
 #include <iostream>
 #include <memory>
 #include <vector>
+
 #include "allocator.h"
 
-using android::hardware::configureRpcThreadpool;
-using android::hardware::hidl_handle;
-using android::hardware::media::bufferpool::V2_0::IClientManager;
-using android::hardware::media::bufferpool::V2_0::ResultStatus;
-using android::hardware::media::bufferpool::V2_0::implementation::BufferId;
-using android::hardware::media::bufferpool::V2_0::implementation::ClientManager;
-using android::hardware::media::bufferpool::V2_0::implementation::ConnectionId;
-using android::hardware::media::bufferpool::V2_0::implementation::TransactionId;
-using android::hardware::media::bufferpool::BufferPoolData;
+using aidl::android::hardware::media::bufferpool2::IClientManager;
+using aidl::android::hardware::media::bufferpool2::ResultStatus;
+using aidl::android::hardware::media::bufferpool2::implementation::BufferId;
+using aidl::android::hardware::media::bufferpool2::implementation::ClientManager;
+using aidl::android::hardware::media::bufferpool2::implementation::ConnectionId;
+using aidl::android::hardware::media::bufferpool2::implementation::TransactionId;
+using aidl::android::hardware::media::bufferpool2::BufferPoolData;
 
 namespace {
 
+const std::string testInstance  = std::string() + ClientManager::descriptor + "/multitest";
+
 // communication message types between processes.
 enum PipeCommand : int32_t {
     INIT_OK = 0,
@@ -71,7 +72,7 @@
 class BufferpoolMultiTest : public ::testing::Test {
  public:
   virtual void SetUp() override {
-    ResultStatus status;
+    BufferPoolStatus status;
     mReceiverPid = -1;
     mConnectionValid = false;
 
@@ -87,7 +88,6 @@
       // tearDown
       pause();
     }
-
     mManager = ClientManager::getInstance();
     ASSERT_NE(mManager, nullptr);
 
@@ -116,7 +116,7 @@
     RecordProperty("description", description);
   }
 
-  android::sp<ClientManager> mManager;
+  std::shared_ptr<ClientManager> mManager;
   std::shared_ptr<BufferPoolAllocator> mAllocator;
   bool mConnectionValid;
   ConnectionId mConnectionId;
@@ -135,7 +135,8 @@
   }
 
   void doReceiver() {
-    configureRpcThreadpool(1, false);
+    ABinderProcess_setThreadPoolMaxThreadCount(1);
+    ABinderProcess_startThreadPool();
     PipeMessage message;
     mManager = ClientManager::getInstance();
     if (!mManager) {
@@ -143,7 +144,11 @@
       sendMessage(mResultPipeFds, message);
       return;
     }
-    android::status_t status = mManager->registerAsService();
+    auto binder = mManager->asBinder();
+    AIBinder_forceDowngradeToSystemStability(binder.get());
+    binder_status_t status =
+        AServiceManager_addService(binder.get(), testInstance.c_str());
+    CHECK_EQ(status, STATUS_OK);
     if (status != android::OK) {
       message.data.command = PipeCommand::INIT_ERROR;
       sendMessage(mResultPipeFds, message);
@@ -156,7 +161,7 @@
     {
       native_handle_t *rhandle = nullptr;
       std::shared_ptr<BufferPoolData> rbuffer;
-      ResultStatus status = mManager->receive(
+      BufferPoolStatus status = mManager->receive(
           message.data.connectionId, message.data.transactionId,
           message.data.bufferId, message.data.timestampUs, &rhandle, &rbuffer);
       mManager->close(message.data.connectionId);
@@ -182,16 +187,20 @@
 
 // Buffer transfer test between processes.
 TEST_F(BufferpoolMultiTest, TransferBuffer) {
-  ResultStatus status;
+  BufferPoolStatus status;
   PipeMessage message;
 
   ASSERT_TRUE(receiveMessage(mResultPipeFds, &message));
+  ABinderProcess_setThreadPoolMaxThreadCount(1);
+  ABinderProcess_startThreadPool();
 
-  android::sp<IClientManager> receiver = IClientManager::getService();
+  std::shared_ptr<IClientManager> receiver = IClientManager::fromBinder(ndk::SpAIBinder(
+      AServiceManager_waitForService(testInstance.c_str())));
+  ASSERT_NE(receiver, nullptr);
   ConnectionId receiverId;
-  ASSERT_TRUE((bool)receiver);
 
-  status = mManager->registerSender(receiver, mConnectionId, &receiverId);
+  bool isNew = true;
+  status = mManager->registerSender(receiver, mConnectionId, &receiverId, &isNew);
   ASSERT_TRUE(status == ResultStatus::OK);
   {
     native_handle_t *shandle = nullptr;
@@ -227,7 +236,6 @@
 }  // anonymous namespace
 
 int main(int argc, char** argv) {
-  android::hardware::details::setTrebleTestingOverride(true);
   ::testing::InitGoogleTest(&argc, argv);
   int status = RUN_ALL_TESTS();
   LOG(INFO) << "Test result = " << status;