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

Commit 724a48aa authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Rename BluetoothHandsfreeClient to BluetoothHeadsetClient 

This makes our terminology consistent with the existing BluetoothHeadset profile

Change-Id: I527977250cf9a34d55d01b357c5c438826e58156
parent 6f3083bc

android/app/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -304,10 +304,10 @@ 
        </service>

    <service

            android:process="@string/process"

            android:name = ".hfpclient.HandsfreeClientService"

            android:name = ".hfpclient.HeadsetClientService"

            android:enabled="@bool/profile_supported_hfpclient">

            <intent-filter>

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

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

            </intent-filter>

        </service>

    </application>

android/app/jni/com_android_bluetooth_hfpclient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "BluetoothHandsfreeClientServiceJni"

#define LOG_TAG "BluetoothHeadsetClientServiceJni"

#define LOG_NDEBUG 0



#include "com_android_bluetooth.h"
@@ -607,7 +607,7 @@ static JNINativeMethod sMethods[] = { 


int register_com_android_bluetooth_hfpclient(JNIEnv* env)

{

    return jniRegisterNativeMethods(env, "com/android/bluetooth/hfpclient/HandsfreeClientStateMachine",

    return jniRegisterNativeMethods(env, "com/android/bluetooth/hfpclient/HeadsetClientStateMachine",

                                    sMethods, NELEM(sMethods));

}

android/app/src/com/android/bluetooth/btservice/Config.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.bluetooth.a2dp.A2dpSinkService; 
import com.android.bluetooth.avrcp.AvrcpControllerService;

import com.android.bluetooth.hdp.HealthService;

import com.android.bluetooth.hfp.HeadsetService;

import com.android.bluetooth.hfpclient.HandsfreeClientService;

import com.android.bluetooth.hfpclient.HeadsetClientService;

import com.android.bluetooth.hid.HidService;

import com.android.bluetooth.pan.PanService;

import com.android.bluetooth.gatt.GattService;
@@ -52,7 +52,7 @@ public class Config { 
        PanService.class,

        GattService.class,

        BluetoothMapService.class,

        HandsfreeClientService.class,

        HeadsetClientService.class,

        AvrcpControllerService.class,

    };

    /**

android/app/src/com/android/bluetooth/hfpclient/HandsfreeClientHalConstants.java→android/app/src/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ package com.android.bluetooth.hfpclient; 
 * @hide

 */



final public class HandsfreeClientHalConstants {

final public class HeadsetClientHalConstants {

    // Do not modify without updating the HAL bt_hf_client.h files.



    // match up with bthf_client_connection_state_t enum of bt_hf_client.h

android/app/src/com/android/bluetooth/hfpclient/HandsfreeClientService.java→android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java

+84 −84

File changed and moved.

Preview size limit exceeded, changes collapsed.