commit 15c192adcbd4502559f87e57cfc9b245071b8349
author Chong Zhang <chz@google.com> Tue May 05 16:24:00 2020 -0700
committer Chong Zhang <chz@google.com> Wed May 06 14:09:48 2020 -0700
tree 1f2796cc2456bda9572d534b71187d7772f9381d
parent 3fa408f83dda44f768ed7e53dc34b5ea78bb41a1

transcoding: remove realtime jobs when a client is removed

Also disallow usage of the client after unregister.

bug: 154734285
test: unit testing
Change-Id: Ib5d54a897c7e56d42d27645fa55ab6f21f435b5e

services/mediatranscoding/MediaTranscodingService.cpp

diff --git a/services/mediatranscoding/MediaTranscodingService.cpp b/services/mediatranscoding/MediaTranscodingService.cpp
index 9e62b97..b843967 100644
--- a/services/mediatranscoding/MediaTranscodingService.cpp
+++ b/services/mediatranscoding/MediaTranscodingService.cpp
@@ -100,9 +100,8 @@
         const std::string& in_clientName, const std::string& in_opPackageName, int32_t in_clientUid,
         int32_t in_clientPid, std::shared_ptr<ITranscodingClient>* _aidl_return) {
     if (in_callback == nullptr) {
-        ALOGE("Client callback can not be null");
         *_aidl_return = nullptr;
-        return Status::fromServiceSpecificError(ERROR_ILLEGAL_ARGUMENT);
+        return STATUS_ERROR_FMT(ERROR_ILLEGAL_ARGUMENT, "Client callback cannot be null!");
     }
 
     int32_t callingPid = AIBinder_getCallingPid();

services/mediatranscoding/tests/mediatranscodingservice_tests.cpp

diff --git a/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp
index b20ce09..a8d4241 100644
--- a/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp
+++ b/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp
@@ -611,6 +611,31 @@
     unregisterMultipleClients();
 }
 
+TEST_F(MediaTranscodingServiceTest, TestClientUseAfterUnregister) {
+    std::shared_ptr<ITranscodingClient> client;
+
+    // Register a client, then unregister.
+    Status status = mService->registerClient(mClientCallback1, kClientName, kClientOpPackageName,
+                                             kClientUseCallingUid, kClientUseCallingPid, &client);
+    EXPECT_TRUE(status.isOk());
+
+    status = client->unregister();
+    EXPECT_TRUE(status.isOk());
+
+    // Test various operations on the client, should fail with ERROR_DISCONNECTED.
+    TranscodingJobParcel job;
+    bool result;
+    status = client->getJobWithId(0, &job, &result);
+    EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
+
+    status = client->cancelJob(0, &result);
+    EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
+
+    TranscodingRequestParcel request;
+    status = client->submitRequest(request, &job, &result);
+    EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
+}
+
 TEST_F(MediaTranscodingServiceTest, TestTranscodingUidPolicy) {
     ALOGD("TestTranscodingUidPolicy starting...");