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

Commit 99ac0e99 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "update_profile_api" am: dced1917 am: e035a123 

Change-Id: Iaa111d4a20144a0a555bc617c3e7db86d09cb21a
parents 43e7f1d0 e035a123

packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java

+8 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settingslib.bluetooth;



import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_AUDIO;

import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED;

import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
@@ -45,6 +46,7 @@ public class A2dpProfile implements LocalBluetoothProfile { 
    private boolean mIsProfileReady;



    private final CachedBluetoothDeviceManager mDeviceManager;

    private final BluetoothAdapter mBluetoothAdapter;



    static final ParcelUuid[] SINK_UUIDS = {

        BluetoothUuid.A2DP_SINK,
@@ -99,7 +101,8 @@ public class A2dpProfile implements LocalBluetoothProfile { 
        mContext = context;

        mDeviceManager = deviceManager;

        mProfileManager = profileManager;

        BluetoothAdapter.getDefaultAdapter().getProfileProxy(context, new A2dpServiceListener(),

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

        mBluetoothAdapter.getProfileProxy(context, new A2dpServiceListener(),

                BluetoothProfile.A2DP);

    }
@@ -158,8 +161,10 @@ public class A2dpProfile implements LocalBluetoothProfile { 
    }



    public boolean setActiveDevice(BluetoothDevice device) {

        if (mService == null) return false;

        return mService.setActiveDevice(device);

        if (mBluetoothAdapter == null) {

            return false;

        }

        return mBluetoothAdapter.setActiveDevice(device, ACTIVE_DEVICE_AUDIO);

    }



    public BluetoothDevice getActiveDevice() {

packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java

+6 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settingslib.bluetooth;



import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_PHONE_CALL;

import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED;

import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
@@ -45,6 +46,7 @@ public class HeadsetProfile implements LocalBluetoothProfile { 


    private final CachedBluetoothDeviceManager mDeviceManager;

    private final LocalBluetoothProfileManager mProfileManager;

    private final BluetoothAdapter mBluetoothAdapter;



    static final ParcelUuid[] UUIDS = {

        BluetoothUuid.HSP,
@@ -99,7 +101,8 @@ public class HeadsetProfile implements LocalBluetoothProfile { 
            LocalBluetoothProfileManager profileManager) {

        mDeviceManager = deviceManager;

        mProfileManager = profileManager;

        BluetoothAdapter.getDefaultAdapter().getProfileProxy(context, new HeadsetServiceListener(),

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

        mBluetoothAdapter.getProfileProxy(context, new HeadsetServiceListener(),

                BluetoothProfile.HEADSET);

    }
@@ -119,10 +122,10 @@ public class HeadsetProfile implements LocalBluetoothProfile { 
    }



    public boolean setActiveDevice(BluetoothDevice device) {

        if (mService == null) {

        if (mBluetoothAdapter == null) {

            return false;

        }

        return mService.setActiveDevice(device);

        return mBluetoothAdapter.setActiveDevice(device, ACTIVE_DEVICE_PHONE_CALL);

    }



    public BluetoothDevice getActiveDevice() {

packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java

+8 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settingslib.bluetooth;



import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_ALL;

import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED;

import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
@@ -45,6 +46,7 @@ public class HearingAidProfile implements LocalBluetoothProfile { 


    static final String NAME = "HearingAid";

    private final LocalBluetoothProfileManager mProfileManager;

    private final BluetoothAdapter mBluetoothAdapter;



    // Order of this profile in device profiles list

    private static final int ORDINAL = 1;
@@ -97,7 +99,8 @@ public class HearingAidProfile implements LocalBluetoothProfile { 
        mContext = context;

        mDeviceManager = deviceManager;

        mProfileManager = profileManager;

        BluetoothAdapter.getDefaultAdapter().getProfileProxy(context,

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

        mBluetoothAdapter.getProfileProxy(context,

                new HearingAidServiceListener(), BluetoothProfile.HEARING_AID);

    }
@@ -156,8 +159,10 @@ public class HearingAidProfile implements LocalBluetoothProfile { 
    }



    public boolean setActiveDevice(BluetoothDevice device) {

        if (mService == null) return false;

        return mService.setActiveDevice(device);

        if (mBluetoothAdapter == null) {

            return false;

        }

        return mBluetoothAdapter.setActiveDevice(device, ACTIVE_DEVICE_ALL);

    }



    public List<BluetoothDevice> getActiveDevices() {