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

Commit 8bb9428e authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Partner Code Review
Browse files

Merge "[4/4] Bluetooth: Add support for HFP Client role." into klp-wireless-dev

parents 7201659b 9688a544

android/app/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -286,5 +286,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>

android/app/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 \

android/app/jni/com_android_bluetooth.h

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

 * Copyright (c) 2014 The Android Open Source Project

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +34,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);

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -980,6 +980,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;

android/app/jni/com_android_bluetooth_hfpclient.cpp

+285 −239

File changed.

Preview size limit exceeded, changes collapsed.