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

Commit c2efba67 authored by chelseahao's avatar chelseahao
Browse files

Make default audio sharing password more secure. 

Test: atest
Bug: 389127608
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I2994fdbfd2aa71970e195bd2989f9abe3246c9cb
parent 645fcbae

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

+15 −6
Original line number Diff line number Diff line
@@ -63,13 +63,13 @@ import com.google.common.collect.ImmutableList; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.nio.charset.StandardCharsets;

import java.security.SecureRandom;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.UUID;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.Executor;

import java.util.concurrent.Executors;
@@ -105,6 +105,10 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
    private static final String SYSUI_PKG = "com.android.systemui";

    private static final String TAG = "LocalBluetoothLeBroadcast";

    private static final boolean DEBUG = BluetoothUtils.D;

    private static final String VALID_PASSWORD_CHARACTERS =

            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_=+[]{}|;:,"

                    + ".<>?/";

    private static final int PASSWORD_LENGTH = 16;



    static final String NAME = "LE_AUDIO_BROADCAST";

    private static final String UNDERLINE = "_";
@@ -1085,11 +1089,16 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
        mBroadcastId = UNKNOWN_VALUE_PLACEHOLDER;

    }



    private String generateRandomPassword() {

        String randomUUID = UUID.randomUUID().toString();

        // first 16 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx

        return randomUUID.substring(0, 8) + randomUUID.substring(9, 13) + randomUUID.substring(14,

                18);

    private static String generateRandomPassword() {

        SecureRandom random = new SecureRandom();

        StringBuilder stringBuilder = new StringBuilder(PASSWORD_LENGTH);



        for (int i = 0; i < PASSWORD_LENGTH; i++) {

            int randomIndex = random.nextInt(VALID_PASSWORD_CHARACTERS.length());

            stringBuilder.append(VALID_PASSWORD_CHARACTERS.charAt(randomIndex));

        }



        return stringBuilder.toString();

    }



    private void registerContentObserver() {