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

Commit 821ed5d7 authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bt-profile-sysprop-tm-dev" into tm-dev am: 9164383d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17225723



Change-Id: I6b13e719448fb3e4e93db8e1c2641c06f03ed09a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff44f114 9164383d

android/app/AndroidManifest.xml

+312 −259

File changed.

Preview size limit exceeded, changes collapsed.

android/app/res/values/config.xml

+0 −26
Original line number Diff line number Diff line
@@ -13,34 +13,8 @@ 
   limitations under the License.

-->

<resources>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <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_le_audio">true</bool>

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

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

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

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

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

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

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

    <bool name="profile_supported_battery">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/a2dp/A2dpService.java

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.media.AudioManager; 
import android.media.BluetoothProfileConnectionInfo;

import android.os.Build;

import android.os.HandlerThread;

import android.sysprop.BluetoothProperties;

import android.util.Log;



import com.android.bluetooth.BluetoothMetricsProto;
@@ -103,6 +104,10 @@ public class A2dpService extends ProfileService { 
    private BroadcastReceiver mBondStateChangedReceiver;

    private BroadcastReceiver mConnectionStateChangedReceiver;



    public static boolean isEnabled() {

        return BluetoothProperties.isProfileA2dpSourceEnabled().orElse(false);

    }



    @Override

    protected IProfileServiceBinder initBinder() {

        return new BluetoothA2dpBinder(this);

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.bluetooth.BluetoothProfile; 
import android.bluetooth.IBluetoothA2dpSink;

import android.content.AttributionSource;

import android.media.AudioManager;

import android.sysprop.BluetoothProperties;

import android.util.Log;



import com.android.bluetooth.Utils;
@@ -63,6 +64,10 @@ public class A2dpSinkService extends ProfileService { 


    A2dpSinkNativeInterface mNativeInterface;



    public static boolean isEnabled() {

        return BluetoothProperties.isProfileA2dpSinkEnabled().orElse(false);

    }



    @Override

    protected boolean start() {

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+5 −13
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.media.AudioManager; 
import android.os.Looper;

import android.os.SystemProperties;

import android.os.UserManager;

import android.sysprop.BluetoothProperties;

import android.util.Log;



import com.android.bluetooth.BluetoothMetricsProto;
@@ -57,7 +58,6 @@ import java.util.Objects; 
public class AvrcpTargetService extends ProfileService {

    private static final String TAG = "AvrcpTargetService";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private static final String AVRCP_ENABLE_PROPERTY = "persist.bluetooth.enablenewavrcp";



    private static final int AVRCP_MAX_VOL = 127;

    private static final int MEDIA_KEY_EVENT_LOGGER_SIZE = 20;
@@ -82,6 +82,10 @@ public class AvrcpTargetService extends ProfileService { 


    private static AvrcpTargetService sInstance = null;



    public static boolean isEnabled() {

        return BluetoothProperties.isProfileAvrcpTargetEnabled().orElse(false);

    }



    class ListCallback implements MediaPlayerList.MediaUpdateCallback {

        @Override

        public void run(MediaData data) {
@@ -179,12 +183,6 @@ public class AvrcpTargetService extends ProfileService { 
    protected void setUserUnlocked(int userId) {

        Log.i(TAG, "User unlocked, initializing the service");



        if (!SystemProperties.getBoolean(AVRCP_ENABLE_PROPERTY, true)) {

            Log.w(TAG, "Skipping initialization of the new AVRCP Target Player List");

            sInstance = null;

            return;

        }



        if (mMediaPlayerList != null) {

            mMediaPlayerList.init(new ListCallback());

        }
@@ -200,12 +198,6 @@ public class AvrcpTargetService extends ProfileService { 
        Log.i(TAG, "Starting the AVRCP Target Service");

        mCurrentData = new MediaData(null, null, null);



        if (!SystemProperties.getBoolean(AVRCP_ENABLE_PROPERTY, true)) {

            Log.w(TAG, "Skipping initialization of the new AVRCP Target Service");

            sInstance = null;

            return true;

        }



        mAudioManager = getSystemService(AudioManager.class);

        sDeviceMaxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);