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

Commit 05860474 authored by Satya Calloji's avatar Satya Calloji Committed by Android Git Automerger
Browse files

am 0912d3dc: Add support for AbsoluteVolume 

* commit '0912d3dc':
  Add support for AbsoluteVolume
parents 8cec0637 0912d3dc

system/btif/src/btif_av.c

+6 −2
Original line number Diff line number Diff line
@@ -960,8 +960,12 @@ bt_status_t btif_av_execute_service(BOOLEAN b_enable) 
          * be initiated by the app/audioflinger layers */

#if (AVRC_METADATA_INCLUDED == TRUE)

         BTA_AvEnable(BTA_SEC_AUTHENTICATE,

             BTA_AV_FEAT_RCTG|BTA_AV_FEAT_METADATA|BTA_AV_FEAT_VENDOR|BTA_AV_FEAT_NO_SCO_SSPD,

             bte_av_callback);

             BTA_AV_FEAT_RCTG|BTA_AV_FEAT_METADATA|BTA_AV_FEAT_VENDOR|BTA_AV_FEAT_NO_SCO_SSPD

#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

             |BTA_AV_FEAT_RCCT

             |BTA_AV_FEAT_ADV_CTRL

#endif

             ,bte_av_callback);

#else

         BTA_AvEnable(BTA_SEC_AUTHENTICATE, (BTA_AV_FEAT_RCTG | BTA_AV_FEAT_NO_SCO_SSPD),

                      bte_av_callback);

system/btif/src/btif_rc.c

+517 −9

File changed.

Preview size limit exceeded, changes collapsed.

system/btif/src/btif_util.c

+3 −1
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ const char *dump_rc_event(UINT8 event) 
        CASE_RETURN_STR(BTA_AV_VENDOR_CMD_EVT)

        CASE_RETURN_STR(BTA_AV_VENDOR_RSP_EVT)

        CASE_RETURN_STR(BTA_AV_META_MSG_EVT)

        CASE_RETURN_STR(BTA_AV_RC_FEAT_EVT)

        default:

            return "UNKNOWN_EVENT";

   }
@@ -489,6 +490,7 @@ const char * dump_rc_notification_event_id(UINT8 event_id) 
        CASE_RETURN_STR(AVRC_EVT_BATTERY_STATUS_CHANGE)

        CASE_RETURN_STR(AVRC_EVT_SYSTEM_STATUS_CHANGE)

        CASE_RETURN_STR(AVRC_EVT_APP_SETTING_CHANGE)

        CASE_RETURN_STR(AVRC_EVT_VOLUME_CHANGE)



        default:

            return "Unhandled Event ID";
@@ -512,7 +514,7 @@ const char* dump_rc_pdu(UINT8 pdu) 
        CASE_RETURN_STR(AVRC_PDU_REGISTER_NOTIFICATION)

        CASE_RETURN_STR(AVRC_PDU_REQUEST_CONTINUATION_RSP)

        CASE_RETURN_STR(AVRC_PDU_ABORT_CONTINUATION_RSP)



        CASE_RETURN_STR(AVRC_PDU_SET_ABSOLUTE_VOLUME)

        default:

            return "Unknown PDU";

    }

system/include/bt_target.h

+4 −0
Original line number Diff line number Diff line
@@ -3487,6 +3487,10 @@ Range: Minimum 12000 (12 secs) when supporting PBF. 
#define AVRC_METADATA_INCLUDED      TRUE

#endif



#ifndef AVRC_ADV_CTRL_INCLUDED

#define AVRC_ADV_CTRL_INCLUDED      TRUE

#endif



/******************************************************************************

**

** MCAP

system/stack/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ LOCAL_SRC_FILES:= \ 
    ./avrc/avrc_sdp.c \

    ./avrc/avrc_opt.c \

    ./avrc/avrc_bld_tg.c \

    ./avrc/avrc_bld_ct.c \

    ./avrc/avrc_pars_tg.c \

    ./avrc/avrc_pars_ct.c \

    ./avrc/avrc_utils.c \

    ./hid/hidh_api.c \

    ./hid/hidh_conn.c \