commit 3a0cf4747666fd0d38c7b95f3cbaee094ce6b9e8
author Jiabin Huang <jiabin@google.com> Tue Nov 03 17:29:35 2020 +0000
committer Jiabin Huang <jiabin@google.com> Tue Nov 03 17:29:35 2020 +0000
tree 38537e76b2e160c2041098d6e7854b000ebcf451
parent 3b4270ecbebad2b5c0d6733eee3fb52e1ddb76aa

Revert "Call getAudioPort to get supported attributes for audio devices."

This reverts commit 3b4270ecbebad2b5c0d6733eee3fb52e1ddb76aa.

Reason for revert: b/172307055

Change-Id: Ic22dad674bbd9eee9d3b24308e2a2e964c6406f2

media/libaudioclient/IAudioFlinger.cpp

diff --git a/media/libaudioclient/IAudioFlinger.cpp b/media/libaudioclient/IAudioFlinger.cpp
index 8ba0f11..7c304a1 100644
--- a/media/libaudioclient/IAudioFlinger.cpp
+++ b/media/libaudioclient/IAudioFlinger.cpp
@@ -796,14 +796,14 @@
         reply.read(ports, *num_ports * sizeof(struct audio_port));
         return status;
     }
-    virtual status_t getAudioPort(struct audio_port_v7 *port)
+    virtual status_t getAudioPort(struct audio_port *port)
     {
-        if (port == nullptr) {
+        if (port == NULL) {
             return BAD_VALUE;
         }
         Parcel data, reply;
         data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
-        data.write(port, sizeof(struct audio_port_v7));
+        data.write(port, sizeof(struct audio_port));
         status_t status = remote()->transact(GET_AUDIO_PORT, data, &reply);
         if (status != NO_ERROR ||
                 (status = (status_t)reply.readInt32()) != NO_ERROR) {
@@ -1495,7 +1495,7 @@
         } break;
         case GET_AUDIO_PORT: {
             CHECK_INTERFACE(IAudioFlinger, data, reply);
-            struct audio_port_v7 port = {};
+            struct audio_port port = {};
             status_t status = data.read(&port, sizeof(struct audio_port));
             if (status != NO_ERROR) {
                 ALOGE("b/23905951");
@@ -1507,7 +1507,7 @@
             }
             reply->writeInt32(status);
             if (status == NO_ERROR) {
-                reply->write(&port, sizeof(struct audio_port_v7));
+                reply->write(&port, sizeof(struct audio_port));
             }
             return NO_ERROR;
         } break;