Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a3769f authored by Ricardo Correa's avatar Ricardo Correa
Browse files

Revert "Allow call audio access for default dialer application" 

This reverts commit ac26cf74.

Reason for revert: Feature has been postponed
Bug: 151761909

Change-Id: I90a977a23c5b97ddf95976cf2c4d517165f8e8c2
parent 3006a835

media/libaudioclient/AudioSystem.cpp

+1 −2
Original line number Diff line number Diff line
@@ -886,7 +886,6 @@ status_t AudioSystem::getOutputForAttr(audio_attributes_t *attr, 
                                        audio_stream_type_t *stream,

                                        pid_t pid,

                                        uid_t uid,

                                        const String16& opPackageName,

                                        const audio_config_t *config,

                                        audio_output_flags_t flags,

                                        audio_port_handle_t *selectedDeviceId,
@@ -896,7 +895,7 @@ status_t AudioSystem::getOutputForAttr(audio_attributes_t *attr, 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return NO_INIT;

    return aps->getOutputForAttr(attr, output, session, stream, pid, uid,

                                 opPackageName, config,

                                 config,

                                 flags, selectedDeviceId, portId, secondaryOutputs);

}

media/libaudioclient/IAudioPolicyService.cpp

+1 −8
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ public: 
                              audio_stream_type_t *stream,

                              pid_t pid,

                              uid_t uid,

                              const String16& opPackageName,

                              const audio_config_t *config,

                              audio_output_flags_t flags,

                              audio_port_handle_t *selectedDeviceId,
@@ -254,7 +253,6 @@ public: 
            }

            data.writeInt32(pid);

            data.writeInt32(uid);

            data.writeString16(opPackageName);

            data.write(config, sizeof(audio_config_t));

            data.writeInt32(static_cast <uint32_t>(flags));

            data.writeInt32(*selectedDeviceId);
@@ -1656,11 +1654,6 @@ status_t BnAudioPolicyService::onTransact( 
            }

            pid_t pid = (pid_t)data.readInt32();

            uid_t uid = (uid_t)data.readInt32();

            String16 opPackageName;

            status = data.readString16(&opPackageName);

            if (status != NO_ERROR) {

                return status;

            }

            audio_config_t config;

            memset(&config, 0, sizeof(audio_config_t));

            data.read(&config, sizeof(audio_config_t));
@@ -1672,7 +1665,7 @@ status_t BnAudioPolicyService::onTransact( 
            std::vector<audio_io_handle_t> secondaryOutputs;

            status = getOutputForAttr(&attr,

                    &output, session, &stream, pid, uid,

                    opPackageName, &config,

                    &config,

                    flags, &selectedDeviceId, &portId, &secondaryOutputs);

            reply->writeInt32(status);

            status = reply->write(&attr, sizeof(audio_attributes_t));

media/libaudioclient/include/media/AudioSystem.h

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ public: 
                                     audio_stream_type_t *stream,

                                     pid_t pid,

                                     uid_t uid,

                                     const String16& opPackageName,

                                     const audio_config_t *config,

                                     audio_output_flags_t flags,

                                     audio_port_handle_t *selectedDeviceId,

media/libaudioclient/include/media/IAudioFlinger.h

+0 −3
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ public: 
            if (clientInfo.readFromParcel(parcel) != NO_ERROR) {

                return DEAD_OBJECT;

            }

            opPackageName = parcel->readString16();

            if (parcel->readInt32() != 0) {

                // TODO: Using unsecurePointer() has some associated security

                //       pitfalls (see declaration for details).
@@ -101,7 +100,6 @@ public: 
            (void)parcel->write(&attr, sizeof(audio_attributes_t));

            (void)parcel->write(&config, sizeof(audio_config_t));

            (void)clientInfo.writeToParcel(parcel);

            (void)parcel->writeString16(opPackageName);

            if (sharedBuffer != 0) {

                (void)parcel->writeInt32(1);

                (void)parcel->writeStrongBinder(IInterface::asBinder(sharedBuffer));
@@ -125,7 +123,6 @@ public: 
        audio_attributes_t attr;

        audio_config_t config;

        AudioClient clientInfo;

        String16 opPackageName;

        sp<IMemory> sharedBuffer;

        uint32_t notificationsPerBuffer;

        float speed;

media/libaudioclient/include/media/IAudioPolicyService.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ public: 
                                      audio_stream_type_t *stream,

                                      pid_t pid,

                                      uid_t uid,

                                      const String16& opPackageName,

                                      const audio_config_t *config,

                                      audio_output_flags_t flags,

                                      audio_port_handle_t *selectedDeviceId,