commit ac4e42982d4537732b30e71c9a00ba0077944984
author Jean-Michel Trivi <jmtrivi@google.com> Thu Dec 22 11:39:31 2016 -0800
committer Jean-Michel Trivi <jmtrivi@google.com> Mon Jun 19 18:03:28 2017 +0000
tree 1774e0b1cba1a173c29aaca85d4147e178c69346
parent c407bd4b32b99cab78e773ac51a57f49cd0985ea

Monitoring of recording: uid of recording session

Pass uid of recording session along with other existing information
  in the recording monitoring callback.
Define new structure, record_client_info, to group uid (new),
  session id (existing) and source (existing) and simplify
  method signatures and marshalling code.

Test: run cts -m CtsMediaTestCases -t android.media.cts.AudioRecordingConfigurationTest#testAudioManagerGetActiveRecordConfigurations
Bug 62579636

Change-Id: I18f66d7e55640a21f31021416a12a3e8094c3690

media/libaudioclient/IAudioPolicyServiceClient.cpp

diff --git a/media/libaudioclient/IAudioPolicyServiceClient.cpp b/media/libaudioclient/IAudioPolicyServiceClient.cpp
index 98a0521..ad7f1de 100644
--- a/media/libaudioclient/IAudioPolicyServiceClient.cpp
+++ b/media/libaudioclient/IAudioPolicyServiceClient.cpp
@@ -48,6 +48,18 @@
     data.writeInt32((int32_t) config->format);
 }
 
+inline void readRecordClientInfoFromParcel(const Parcel& data, record_client_info_t *clientInfo) {
+    clientInfo->uid = (uid_t) data.readUint32();
+    clientInfo->session = (audio_session_t) data.readInt32();
+    clientInfo->source = (audio_source_t) data.readInt32();
+}
+
+inline void writeRecordClientInfoFromParcel(Parcel& data, const record_client_info_t *clientInfo) {
+    data.writeUint32((uint32_t) clientInfo->uid);
+    data.writeInt32((int32_t) clientInfo->session);
+    data.writeInt32((int32_t) clientInfo->source);
+}
+
 // ----------------------------------------------------------------------
 class BpAudioPolicyServiceClient : public BpInterface<IAudioPolicyServiceClient>
 {
@@ -80,14 +92,13 @@
         remote()->transact(MIX_STATE_UPDATE, data, &reply, IBinder::FLAG_ONEWAY);
     }
 
-    void onRecordingConfigurationUpdate(int event, audio_session_t session,
-            audio_source_t source, const audio_config_base_t *clientConfig,
+    void onRecordingConfigurationUpdate(int event, const record_client_info_t *clientInfo,
+            const audio_config_base_t *clientConfig,
             const audio_config_base_t *deviceConfig, audio_patch_handle_t patchHandle) {
         Parcel data, reply;
         data.writeInterfaceToken(IAudioPolicyServiceClient::getInterfaceDescriptor());
         data.writeInt32(event);
-        data.writeInt32(session);
-        data.writeInt32(source);
+        writeRecordClientInfoFromParcel(data, clientInfo);
         writeAudioConfigBaseToParcel(data, clientConfig);
         writeAudioConfigBaseToParcel(data, deviceConfig);
         data.writeInt32(patchHandle);
@@ -123,14 +134,14 @@
     case RECORDING_CONFIGURATION_UPDATE: {
             CHECK_INTERFACE(IAudioPolicyServiceClient, data, reply);
             int event = (int) data.readInt32();
-            audio_session_t session = (audio_session_t) data.readInt32();
-            audio_source_t source = (audio_source_t) data.readInt32();
+            record_client_info_t clientInfo;
             audio_config_base_t clientConfig;
             audio_config_base_t deviceConfig;
+            readRecordClientInfoFromParcel(data, &clientInfo);
             readAudioConfigBaseFromParcel(data, &clientConfig);
             readAudioConfigBaseFromParcel(data, &deviceConfig);
             audio_patch_handle_t patchHandle = (audio_patch_handle_t) data.readInt32();
-            onRecordingConfigurationUpdate(event, session, source, &clientConfig, &deviceConfig,
+            onRecordingConfigurationUpdate(event, &clientInfo, &clientConfig, &deviceConfig,
                     patchHandle);
             return NO_ERROR;
         } break;