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

Commit f67305dc authored by chelseahao's avatar chelseahao Committed by Chelsea Hao
Browse files

To keep broadcast name to be under 32 char, limit the phone name prefix to at most 27 char. 

Test: atest
Bug: 380770776
Flag: EXEMPT bug fix
Change-Id: I3dbf87ec5831f79994252d86bef581684f0f9309
parent d9a023d1

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() {