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

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

Merge cherrypicks of [5704859, 5705300, 5704034, 5704195, 5705082, 5704058,... 

Merge cherrypicks of [5704859, 5705300, 5704034, 5704195, 5705082, 5704058, 5704059, 5704932, 5705340, 5705341, 5705342, 5705343, 5705344, 5705361, 5705362, 5705363, 5705364, 5704870, 5704196, 5705083, 5701785, 5701786, 5701787, 5704035, 5705261, 5705281, 5704036, 5704037, 5704038, 5704871, 5704933, 5704872, 5705347, 5705262, 5704934] into pi-qpr2-release

Change-Id: Ifb7d048c4deb34b18e69173fd09e91c45980e2d9
parents dfe0985d e8a14bfa

framework/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java

+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();

    }