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

Commit ee510382 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "To keep broadcast name to be under 32 char, limit the phone name prefix... 

Merge "To keep broadcast name to be under 32 char, limit the phone name prefix to at most 27 char." into main
parents ab32c3f4 f67305dc

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

+7 −2
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
    public static final int BROADCAST_STATE_UNKNOWN = 0;

    public static final int BROADCAST_STATE_ON = 1;

    public static final int BROADCAST_STATE_OFF = 2;

    private static final int BROADCAST_NAME_PREFIX_MAX_LENGTH = 27;



    @Retention(RetentionPolicy.SOURCE)

    @IntDef(
@@ -1116,13 +1117,17 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
    private String getDefaultValueOfBroadcastName() {

        // set the default value;

        int postfix = ThreadLocalRandom.current().nextInt(DEFAULT_CODE_MIN, DEFAULT_CODE_MAX);

        return BluetoothAdapter.getDefaultAdapter().getName() + UNDERLINE + postfix;

        String name = BluetoothAdapter.getDefaultAdapter().getName();

        return (name.length() < BROADCAST_NAME_PREFIX_MAX_LENGTH ? name : name.substring(0,

                BROADCAST_NAME_PREFIX_MAX_LENGTH)) + UNDERLINE + postfix;

    }



    private String getDefaultValueOfProgramInfo() {

        // set the default value;

        int postfix = ThreadLocalRandom.current().nextInt(DEFAULT_CODE_MIN, DEFAULT_CODE_MAX);

        return BluetoothAdapter.getDefaultAdapter().getName() + UNDERLINE + postfix;

        String name = BluetoothAdapter.getDefaultAdapter().getName();

        return (name.length() < BROADCAST_NAME_PREFIX_MAX_LENGTH ? name : name.substring(0,

                BROADCAST_NAME_PREFIX_MAX_LENGTH)) + UNDERLINE + postfix;

    }



    private byte[] getDefaultValueOfBroadcastCode() {