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

Commit 8ded66a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "hearing-aid-service-2" 

* changes:
  Revert "Hearing Aid Service Stub"
  Revert "Hearing Aid State Machine without native interface"
parents 18bc01c5 8e870436

android/app/AndroidManifest.xml

+0 −8
Original line number Diff line number Diff line
@@ -382,14 +382,6 @@ 
                <action android:name="android.bluetooth.IBluetoothPbapClient" />

            </intent-filter>

        </service>

        <service

            android:process="@string/process"

            android:name = ".hearingaid.HearingAidService"

            android:enabled="@bool/profile_supported_hearing_aid">

            <intent-filter>

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

            </intent-filter>

        </service>

        <!-- Authenticator for PBAP account. -->

        <service

            android:process="@string/process"

android/app/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
    <bool name="profile_supported_pbapclient">false</bool>

    <bool name="profile_supported_mapmce">false</bool>

    <bool name="profile_supported_hid_device">true</bool>

    <bool name="profile_supported_hearing_aid">true</bool>



    <!-- If true, we will require location to be enabled on the device to

         fire Bluetooth LE scan result callbacks in addition to having one

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

+1 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.bluetooth.a2dpsink.A2dpSinkService; 
import com.android.bluetooth.avrcpcontroller.AvrcpControllerService;

import com.android.bluetooth.gatt.GattService;

import com.android.bluetooth.hdp.HealthService;

import com.android.bluetooth.hearingaid.HearingAidService;

import com.android.bluetooth.hfp.HeadsetService;

import com.android.bluetooth.hfpclient.HeadsetClientService;

import com.android.bluetooth.hid.HidDeviceService;
@@ -95,9 +94,7 @@ public class Config { 
            new ProfileConfig(BluetoothOppService.class, R.bool.profile_supported_opp,

                    (1 << BluetoothProfile.OPP)),

            new ProfileConfig(BluetoothPbapService.class, R.bool.profile_supported_pbap,

                    (1 << BluetoothProfile.PBAP)),

            new ProfileConfig(HearingAidService.class, R.bool.profile_supported_hearing_aid,

            (1 << BluetoothProfile.HEARING_AID))

                    (1 << BluetoothProfile.PBAP))

    };



    private static Class[] sSupportedProfiles = new Class[0];