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

Commit 40a5d55e authored by Bonian Chen's avatar Bonian Chen
Browse files

Revert "resolve merge conflicts of a0c27243 to... 

Revert "resolve merge conflicts of a0c27243 to qt-qpr1-dev-plus-aosp"

This reverts commit c91edfc6.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=test_suites_x86_64&lkgb=6282841&lkbb=6283012&fkbb=6283012, bug b/151187299

Change-Id: If10ccb38e2e3eb5aa13ec84ccf614577b5aeef2c
BUG: 151187299
parent c91edfc6

media/libaudioclient/IAudioPolicyService.cpp

+1 −16
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ enum { 
    SET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,

    REMOVE_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,

    GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,

    AUDIO_MODULES_UPDATED,  // oneway

};



#define MAX_ITEMS_PER_LIST 1024
@@ -1337,13 +1336,6 @@ public: 
        }

        return static_cast<status_t>(reply.readInt32());

    }



    virtual void onNewAudioModulesAvailable()

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());

        remote()->transact(AUDIO_MODULES_UPDATED, data, &reply, IBinder::FLAG_ONEWAY);

    }

};



IMPLEMENT_META_INTERFACE(AudioPolicyService, "android.media.IAudioPolicyService");
@@ -1410,8 +1402,7 @@ status_t BnAudioPolicyService::onTransact( 
        case SET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:

        case REMOVE_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:

        case GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:

        case SET_ALLOWED_CAPTURE_POLICY:

        case AUDIO_MODULES_UPDATED: {

        case SET_ALLOWED_CAPTURE_POLICY: {

            if (!isServiceUid(IPCThreadState::self()->getCallingUid())) {

                ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",

                      __func__, code, IPCThreadState::self()->getCallingPid(),
@@ -2468,12 +2459,6 @@ status_t BnAudioPolicyService::onTransact( 
            return NO_ERROR;

        }



        case AUDIO_MODULES_UPDATED: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            onNewAudioModulesAvailable();

            return NO_ERROR;

        } break;



        default:

            return BBinder::onTransact(code, data, reply, flags);

    }