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

Commit 6c085150 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5160973 from e74019dc88bb3136a2f5fa0dd419e4684f005888 to qt-release

Change-Id: Ie7d057b16c9a31bd6fd71b7789a33036bde94337
parents 028db96a 318c4573
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.bluetooth;

import android.os.Parcel;
import android.os.Parcelable;
import android.util.EventLog;


/**
@@ -30,6 +31,8 @@ import android.os.Parcelable;
 */
public final class BluetoothHidDeviceAppSdpSettings implements Parcelable {

    private static final int MAX_DESCRIPTOR_SIZE = 2048;

    private final String mName;
    private final String mDescription;
    private final String mProvider;
@@ -55,6 +58,12 @@ public final class BluetoothHidDeviceAppSdpSettings implements Parcelable {
        mDescription = description;
        mProvider = provider;
        mSubclass = subclass;

        if (descriptors == null || descriptors.length > MAX_DESCRIPTOR_SIZE) {
            EventLog.writeEvent(0x534e4554, "119819889", -1, "");
            throw new IllegalArgumentException("descriptors must be not null and shorter than "
                    + MAX_DESCRIPTOR_SIZE);
        }
        mDescriptors = descriptors.clone();
    }

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ import java.util.List;
@RequiresFeature(PackageManager.FEATURE_BLUETOOTH)
public final class BluetoothManager {
    private static final String TAG = "BluetoothManager";
    private static final boolean DBG = true;
    private static final boolean VDBG = true;
    private static final boolean DBG = false;

    private final BluetoothAdapter mAdapter;