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

Commit 2e6d4b42 authored by Jack He's avatar Jack He Committed by Gerrit Code Review
Browse files

Merge changes I343ff48c,I4b1ecf81 

* changes:
  hap: Support multiple callbacks per App
  hap: Refactor service to match the new API
parents fb34ed57 92a67970

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

+10 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.bluetooth.Utils; 
import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.bluetooth.csip.CsipSetCoordinatorService;

import com.android.bluetooth.hap.HapClientService;

import com.android.bluetooth.hearingaid.HearingAidService;

import com.android.bluetooth.hfp.HeadsetService;

import com.android.bluetooth.hid.HidHostService;
@@ -296,6 +297,7 @@ class PhonePolicy { 
             mFactory.getCsipSetCoordinatorService();

        VolumeControlService volumeControlService =

             mFactory.getVolumeControlService();

        HapClientService hapClientService = mFactory.getHapClientService();



        // Set profile priorities only for the profiles discovered on the remote device.

        // This avoids needless auto-connect attempts to profiles non-existent on the remote device
@@ -364,6 +366,14 @@ class PhonePolicy { 
            mAdapterService.getDatabase().setProfileConnectionPolicy(device,

                    BluetoothProfile.VOLUME_CONTROL, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

        }



        if ((hapClientService != null) && Utils.arrayContains(uuids,

                BluetoothUuid.HAS) && (hapClientService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_UNKNOWN)) {

            debugLog("setting hearing access profile priority for device " + device);

            mAdapterService.getDatabase().setProfileConnectionPolicy(device,

                    BluetoothProfile.HAP_CLIENT, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

        }

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

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

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.bluetooth.btservice; 
import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.avrcp.AvrcpTargetService;

import com.android.bluetooth.csip.CsipSetCoordinatorService;

import com.android.bluetooth.hap.HapClientService;

import com.android.bluetooth.hearingaid.HearingAidService;

import com.android.bluetooth.hfp.HeadsetService;

import com.android.bluetooth.hid.HidDeviceService;
@@ -73,4 +74,8 @@ public class ServiceFactory { 
    public VolumeControlService getVolumeControlService() {

        return VolumeControlService.getVolumeControlService();

    }



    public HapClientService getHapClientService() {

        return HapClientService.getHapClientService();

    }

}

android/app/src/com/android/bluetooth/gatt/GattService.java

+1 −2
Original line number Diff line number Diff line
@@ -168,8 +168,7 @@ public class GattService extends ProfileService { 
            UUID.fromString("00001850-0000-1000-8000-00805F9B34FB"), // PACS

            UUID.fromString("0000184E-0000-1000-8000-00805F9B34FB"), // ASCS

            UUID.fromString("0000184F-0000-1000-8000-00805F9B34FB"), // BASS

            /* FIXME: Not known yet, using a placeholder instead. */

            UUID.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE"), // HAP

            UUID.fromString("00001854-0000-1000-8000-00805F9B34FB"), // HAP

    };



    /**