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

Commit 997c4c69 authored by Brian Delwiche's avatar Brian Delwiche Committed by mse1969
Browse files

Improve audio sharing password handling 

This is a backport of ag/31824318.  ag/31424453 against the same bug is
superseded by these changes and need not be backported.

Test: atest
Bug: 389127608
Ignore-AOSP-First: security
Tag: #security
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d3f4de60e49dabd1fcafac8db352266e5cf1863)
Merged-In: If2ad220dc2f4890ee67be62962a9b25d2f803e24
Change-Id: If2ad220dc2f4890ee67be62962a9b25d2f803e24
parent 70be40ee

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

+15 −5
Original line number Diff line number Diff line
@@ -45,11 +45,11 @@ import androidx.annotation.RequiresApi; 
import com.android.settingslib.R;



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.UUID;

import java.util.concurrent.Executor;

import java.util.concurrent.Executors;

import java.util.concurrent.ThreadLocalRandom;
@@ -62,6 +62,10 @@ import java.util.concurrent.ThreadLocalRandom; 
public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile {

    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 = "_";
@@ -602,10 +606,16 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
        mBroadcastId = UNKNOWN_VALUE_PLACEHOLDER;

    }



    private String generateRandomPassword() {

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

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

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

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