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

Commit 087b95ae authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Bluetooth: Support HFP Client role on Bluedroid."

parents 127f881f 55e7d22f

AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -270,5 +270,13 @@ 
                <action android:name="android.bluetooth.IBluetoothPan" />

            </intent-filter>

        </service>

    <service

            android:process="@string/process"

            android:name = ".hfpclient.HandsfreeClientService"

            android:enabled="@bool/profile_supported_hfpclient">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothHandsfreeClient" />

            </intent-filter>

        </service>

    </application>

</manifest>

jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES:= \

    com_android_bluetooth_btservice_AdapterService.cpp \

    com_android_bluetooth_hfp.cpp \

    com_android_bluetooth_hfpclient.cpp \

    com_android_bluetooth_a2dp.cpp \

    com_android_bluetooth_avrcp.cpp \

    com_android_bluetooth_hid.cpp \

jni/com_android_bluetooth.h

+4 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Linux Foundation. All rights reserved

 * Not a Contribution.

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +35,8 @@ JNIEnv* getCallbackEnv(); 


int register_com_android_bluetooth_hfp(JNIEnv* env);



int register_com_android_bluetooth_hfpclient(JNIEnv* env);



int register_com_android_bluetooth_a2dp(JNIEnv* env);



int register_com_android_bluetooth_avrcp(JNIEnv* env);

jni/com_android_bluetooth_btservice_AdapterService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1077,6 +1077,11 @@ jint JNI_OnLoad(JavaVM *jvm, void *reserved) 
        return JNI_ERR;

    }



    if ((status = android::register_com_android_bluetooth_hfpclient(e)) < 0) {

        ALOGE("jni hfp client registration failure, status: %d", status);

        return JNI_ERR;

    }



    if ((status = android::register_com_android_bluetooth_a2dp(e)) < 0) {

        ALOGE("jni a2dp registration failure: %d", status);

        return JNI_ERR;

jni/com_android_bluetooth_hfpclient.cpp

0 → 100644
+587 −0

File added.

Preview size limit exceeded, changes collapsed.