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

Commit a8843a7f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle null identity address in BluetoothOppPreference" into main am: 77da0b9a 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3071246



Change-Id: I22ffac71187da9e9c94b30be8ba82d93e291d6a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77247dd1 77da0b9a

android/app/src/com/android/bluetooth/opp/BluetoothOppPreference.java

+27 −6
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ import android.content.SharedPreferences; 
import android.content.SharedPreferences.Editor;

import android.util.Log;



import com.android.bluetooth.Utils;

import com.android.bluetooth.flags.Flags;



import java.util.HashMap;



/**
@@ -97,16 +100,27 @@ public class BluetoothOppPreference { 
    }



    private String getChannelKey(BluetoothDevice remoteDevice, int uuid) {

        return remoteDevice.getIdentityAddress() + "_" + Integer.toHexString(uuid);

        String identityAddress =

                Flags.identityAddressNullIfUnknown()

                        ? Utils.getBrEdrAddress(remoteDevice)

                        : remoteDevice.getIdentityAddress();

        return identityAddress + "_" + Integer.toHexString(uuid);

    }



    public String getName(BluetoothDevice remoteDevice) {

        String identityAddress = remoteDevice.getIdentityAddress();

        String identityAddress =

                Flags.identityAddressNullIfUnknown()

                        ? Utils.getBrEdrAddress(remoteDevice)

                        : remoteDevice.getIdentityAddress();

        if (identityAddress != null && identityAddress.equals("FF:FF:FF:00:00:00")) {

            return "localhost";

        }

        if (!mNames.isEmpty()) {

            String name = mNames.get(remoteDevice.getIdentityAddress());

            String name =

                    mNames.get(

                            Flags.identityAddressNullIfUnknown()

                                    ? Utils.getBrEdrAddress(remoteDevice)

                                    : remoteDevice.getIdentityAddress());

            if (name != null) {

                return name;

            }
@@ -131,9 +145,13 @@ public class BluetoothOppPreference { 
        Log.v(TAG, "Setname for " + remoteDevice.getIdentityAddress() + " to " + name);

        if (name != null && !name.equals(getName(remoteDevice))) {

            Editor ed = mNamePreference.edit();

            ed.putString(remoteDevice.getIdentityAddress(), name);

            String address =

                    Flags.identityAddressNullIfUnknown()

                            ? Utils.getBrEdrAddress(remoteDevice)

                            : remoteDevice.getIdentityAddress();

            ed.putString(address, name);

            ed.apply();

            mNames.put(remoteDevice.getIdentityAddress(), name);

            mNames.put(address, name);

        }

    }
@@ -159,7 +177,10 @@ public class BluetoothOppPreference { 


    public void removeName(BluetoothDevice remoteDevice) {

        Editor ed = mNamePreference.edit();

        String key = remoteDevice.getIdentityAddress();

        String key =

                Flags.identityAddressNullIfUnknown()

                        ? Utils.getBrEdrAddress(remoteDevice)

                        : remoteDevice.getIdentityAddress();

        ed.remove(key);

        ed.apply();

        mNames.remove(key);