transcoding: change getClientUids to return nullable int[]
Returning int[] in out arg list doesn't work for Java client.
Change it to return nullable int[] instead and null return
indicates failure.
Bug: 171398942
test: transcoding unit tests.
Change-Id: Ic6b8959af8785653a33697efbec075071785001b
diff --git a/media/libmediatranscoding/TranscodingClientManager.cpp b/media/libmediatranscoding/TranscodingClientManager.cpp
index 086c658..6dbcaf9 100644
--- a/media/libmediatranscoding/TranscodingClientManager.cpp
+++ b/media/libmediatranscoding/TranscodingClientManager.cpp
@@ -97,8 +97,8 @@
Status addClientUid(int32_t /*in_sessionId*/, int32_t /*in_clientUid*/,
bool* /*_aidl_return*/) override;
- Status getClientUids(int32_t /*in_sessionId*/, std::vector<int32_t>* /*out_clientUids*/,
- bool* /*_aidl_return*/) override;
+ Status getClientUids(int32_t /*in_sessionId*/,
+ std::optional<std::vector<int32_t>>* /*_aidl_return*/) override;
Status unregister() override;
};
@@ -259,10 +259,9 @@
return Status::ok();
}
-Status TranscodingClientManager::ClientImpl::getClientUids(int32_t in_sessionId,
- std::vector<int32_t>* out_clientUids,
- bool* _aidl_return) {
- *_aidl_return = false;
+Status TranscodingClientManager::ClientImpl::getClientUids(
+ int32_t in_sessionId, std::optional<std::vector<int32_t>>* _aidl_return) {
+ *_aidl_return = std::nullopt;
std::shared_ptr<TranscodingClientManager> owner;
if (mAbandoned || (owner = mOwner.lock()) == nullptr) {
@@ -273,8 +272,11 @@
return Status::ok();
}
- *_aidl_return =
- owner->mSessionController->getClientUids(mClientId, in_sessionId, out_clientUids);
+ std::vector<int32_t> result;
+
+ if (owner->mSessionController->getClientUids(mClientId, in_sessionId, &result)) {
+ *_aidl_return = result;
+ }
return Status::ok();
}
diff --git a/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl b/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl
index c6fa57f..9ef9052 100644
--- a/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl
+++ b/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl
@@ -77,7 +77,8 @@
* @clientUids array to hold the retrieved client uid list.
* @return false if the session doesn't exist, true otherwise.
*/
- boolean getClientUids(in int sessionId, out int[] clientUids);
+ @nullable
+ int[] getClientUids(in int sessionId);
/**
* Unregister the client with the MediaTranscodingService.
diff --git a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
index b7b1279..9233410 100644
--- a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
+++ b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
@@ -577,7 +577,7 @@
addMultipleClients();
bool result;
- std::vector<int32_t> clientUids;
+ std::optional<std::vector<int32_t>> clientUids;
TranscodingRequestParcel request;
TranscodingSessionParcel session;
uid_t ownUid = ::getuid();
@@ -587,10 +587,10 @@
EXPECT_FALSE(result);
EXPECT_TRUE(mClient1->addClientUid(SESSION(0), ownUid, &result).isOk());
EXPECT_FALSE(result);
- EXPECT_TRUE(mClient1->getClientUids(-1, &clientUids, &result).isOk());
- EXPECT_FALSE(result);
- EXPECT_TRUE(mClient1->getClientUids(SESSION(0), &clientUids, &result).isOk());
- EXPECT_FALSE(result);
+ EXPECT_TRUE(mClient1->getClientUids(-1, &clientUids).isOk());
+ EXPECT_EQ(clientUids, std::nullopt);
+ EXPECT_TRUE(mClient1->getClientUids(SESSION(0), &clientUids).isOk());
+ EXPECT_EQ(clientUids, std::nullopt);
unregisterMultipleClients();
}
@@ -599,7 +599,7 @@
addMultipleClients();
bool result;
- std::vector<int32_t> clientUids;
+ std::optional<std::vector<int32_t>> clientUids;
TranscodingRequestParcel request;
TranscodingSessionParcel session;
uid_t ownUid = ::getuid();
@@ -612,10 +612,10 @@
EXPECT_TRUE(result);
// Should have own uid in client uid list.
- EXPECT_TRUE(mClient1->getClientUids(SESSION(0), &clientUids, &result).isOk());
- EXPECT_TRUE(result);
- EXPECT_EQ(clientUids.size(), 1);
- EXPECT_EQ(clientUids[0], ownUid);
+ EXPECT_TRUE(mClient1->getClientUids(SESSION(0), &clientUids).isOk());
+ EXPECT_NE(clientUids, std::nullopt);
+ EXPECT_EQ(clientUids->size(), 1);
+ EXPECT_EQ((*clientUids)[0], ownUid);
// Adding invalid client uid should fail.
EXPECT_TRUE(mClient1->addClientUid(SESSION(0), kInvalidClientUid, &result).isOk());
@@ -633,28 +633,28 @@
EXPECT_TRUE(result);
// Should not have own uid in client uid list.
- EXPECT_TRUE(mClient1->getClientUids(SESSION(1), &clientUids, &result).isOk());
- EXPECT_TRUE(result);
- EXPECT_EQ(clientUids.size(), 0);
+ EXPECT_TRUE(mClient1->getClientUids(SESSION(1), &clientUids).isOk());
+ EXPECT_NE(clientUids, std::nullopt);
+ EXPECT_EQ(clientUids->size(), 0);
// Add own uid (with IMediaTranscodingService::USE_CALLING_UID) again, should succeed.
EXPECT_TRUE(
mClient1->addClientUid(SESSION(1), IMediaTranscodingService::USE_CALLING_UID, &result)
.isOk());
EXPECT_TRUE(result);
- EXPECT_TRUE(mClient1->getClientUids(SESSION(1), &clientUids, &result).isOk());
- EXPECT_TRUE(result);
- EXPECT_EQ(clientUids.size(), 1);
- EXPECT_EQ(clientUids[0], ownUid);
+ EXPECT_TRUE(mClient1->getClientUids(SESSION(1), &clientUids).isOk());
+ EXPECT_NE(clientUids, std::nullopt);
+ EXPECT_EQ(clientUids->size(), 1);
+ EXPECT_EQ((*clientUids)[0], ownUid);
// Add more uids, should succeed.
int32_t kFakeUid = ::getuid() ^ 0x1;
EXPECT_TRUE(mClient1->addClientUid(SESSION(1), kFakeUid, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_TRUE(mClient1->getClientUids(SESSION(1), &clientUids, &result).isOk());
- EXPECT_TRUE(result);
+ EXPECT_TRUE(mClient1->getClientUids(SESSION(1), &clientUids).isOk());
+ EXPECT_NE(clientUids, std::nullopt);
std::unordered_set<uid_t> uidSet;
- uidSet.insert(clientUids.begin(), clientUids.end());
+ uidSet.insert(clientUids->begin(), clientUids->end());
EXPECT_EQ(uidSet.size(), 2);
EXPECT_EQ(uidSet.count(ownUid), 1);
EXPECT_EQ(uidSet.count(kFakeUid), 1);