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

Commit beaf3d74 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7537202 from 31679534 to sc-v2-release

Change-Id: I107b3571647a77f38163f3833869eac650d3fc0a
parents ee2505a4 31679534
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static android.os.PowerExemptionManager.TEMPORARY_ALLOW_LIST_TYPE_FOREGRO

import android.Manifest;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SuppressLint;
import android.app.AppGlobals;
@@ -62,6 +63,7 @@ import android.provider.DeviceConfig;
import android.provider.Telephony;
import android.util.Log;

import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.ProfileService;

import org.xmlpull.v1.XmlPullParser;
@@ -113,6 +115,15 @@ public final class Utils {
        return c == 'w' || c == 'W';
    }

    public static @Nullable String getName(@Nullable BluetoothDevice device) {
        final AdapterService service = AdapterService.getAdapterService();
        if (service != null && device != null) {
            return service.getRemoteName(device);
        } else {
            return null;
        }
    }

    public static String getAddressStringFromByte(byte[] address) {
        if (address == null || address.length != BD_ADDR_LEN) {
            return null;
+16 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
import android.bluetooth.BufferConstraints;
import android.bluetooth.IBluetoothA2dp;
import android.content.Attributable;
import android.content.AttributionSource;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -1241,6 +1242,7 @@ public class A2dpService extends ProfileService {

        @Override
        public boolean connectWithAttribution(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return false;
@@ -1255,6 +1257,7 @@ public class A2dpService extends ProfileService {

        @Override
        public boolean disconnectWithAttribution(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return false;
@@ -1300,6 +1303,7 @@ public class A2dpService extends ProfileService {
        @Override
        public int getConnectionStateWithAttribution(BluetoothDevice device,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return BluetoothProfile.STATE_DISCONNECTED;
@@ -1309,6 +1313,7 @@ public class A2dpService extends ProfileService {

        @Override
        public boolean setActiveDevice(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return false;
@@ -1328,6 +1333,7 @@ public class A2dpService extends ProfileService {
        @Override
        public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return false;
@@ -1337,6 +1343,7 @@ public class A2dpService extends ProfileService {

        @Override
        public int getPriority(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
@@ -1346,6 +1353,7 @@ public class A2dpService extends ProfileService {

        @Override
        public int getConnectionPolicy(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
@@ -1371,6 +1379,7 @@ public class A2dpService extends ProfileService {

        @Override
        public boolean isA2dpPlaying(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return false;
@@ -1381,6 +1390,7 @@ public class A2dpService extends ProfileService {
        @Override
        public BluetoothCodecStatus getCodecStatus(BluetoothDevice device,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return null;
@@ -1391,6 +1401,7 @@ public class A2dpService extends ProfileService {
        @Override
        public void setCodecConfigPreference(BluetoothDevice device,
                BluetoothCodecConfig codecConfig, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return;
@@ -1400,6 +1411,7 @@ public class A2dpService extends ProfileService {

        @Override
        public void enableOptionalCodecs(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return;
@@ -1409,6 +1421,7 @@ public class A2dpService extends ProfileService {

        @Override
        public void disableOptionalCodecs(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return;
@@ -1418,6 +1431,7 @@ public class A2dpService extends ProfileService {

        @Override
        public int supportsOptionalCodecs(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return BluetoothA2dp.OPTIONAL_CODECS_SUPPORT_UNKNOWN;
@@ -1427,6 +1441,7 @@ public class A2dpService extends ProfileService {

        @Override
        public int getOptionalCodecsEnabled(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN;
@@ -1437,6 +1452,7 @@ public class A2dpService extends ProfileService {
        @Override
        public void setOptionalCodecsEnabled(BluetoothDevice device, int value,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpService service = getService(source);
            if (service == null) {
                return;
+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.bluetooth.BluetoothAudioConfig;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.IBluetoothA2dpSink;
import android.content.Attributable;
import android.content.AttributionSource;
import android.media.AudioManager;
import android.util.Log;
@@ -206,6 +207,7 @@ public class A2dpSinkService extends ProfileService {

        @Override
        public boolean connect(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpSinkService service = getService(source);
            if (service == null) {
                return false;
@@ -215,6 +217,7 @@ public class A2dpSinkService extends ProfileService {

        @Override
        public boolean disconnect(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpSinkService service = getService(source);
            if (service == null) {
                return false;
@@ -243,6 +246,7 @@ public class A2dpSinkService extends ProfileService {

        @Override
        public int getConnectionState(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpSinkService service = getService(source);
            if (service == null) {
                return BluetoothProfile.STATE_DISCONNECTED;
@@ -253,6 +257,7 @@ public class A2dpSinkService extends ProfileService {
        @Override
        public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpSinkService service = getService(source);
            if (service == null) {
                return false;
@@ -262,6 +267,7 @@ public class A2dpSinkService extends ProfileService {

        @Override
        public int getConnectionPolicy(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpSinkService service = getService(source);
            if (service == null) {
                return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
@@ -271,6 +277,7 @@ public class A2dpSinkService extends ProfileService {

        @Override
        public boolean isA2dpPlaying(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpSinkService service = getService(source);
            if (service == null) {
                return false;
@@ -281,6 +288,7 @@ public class A2dpSinkService extends ProfileService {
        @Override
        public BluetoothAudioConfig getAudioConfig(BluetoothDevice device,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            A2dpSinkService service = getService(source);
            if (service == null) {
                return null;
+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class A2dpSinkStateMachine extends StateMachine {
     */
    public void dump(StringBuilder sb) {
        ProfileService.println(sb, "mDevice: " + mDevice.getAddress() + "("
                + mDevice.getName() + ") " + this.toString());
                + Utils.getName(mDevice) + ") " + this.toString());
    }

    @Override
+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.bluetooth.BluetoothAvrcpPlayerSettings;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.IBluetoothAvrcpController;
import android.content.Attributable;
import android.content.AttributionSource;
import android.content.Intent;
import android.support.v4.media.MediaBrowserCompat.MediaItem;
@@ -387,6 +388,7 @@ public class AvrcpControllerService extends ProfileService {

        @Override
        public int getConnectionState(BluetoothDevice device, AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            AvrcpControllerService service = getService(source);
            if (service == null) {
                return BluetoothProfile.STATE_DISCONNECTED;
@@ -397,6 +399,7 @@ public class AvrcpControllerService extends ProfileService {
        @Override
        public void sendGroupNavigationCmd(BluetoothDevice device, int keyCode, int keyState,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            AvrcpControllerService service = getService(source);
            if (service == null) {
                return;
@@ -418,6 +421,7 @@ public class AvrcpControllerService extends ProfileService {
        @Override
        public BluetoothAvrcpPlayerSettings getPlayerSettings(BluetoothDevice device,
                AttributionSource source) {
            Attributable.setAttributionSource(device, source);
            AvrcpControllerService service = getService(source);
            if (service == null) {
                return null;
Loading