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

Commit 68965470 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "OPP: Show remote device local (Alias) name." am: 929ae14a am: 95509aa1 

am: d77c0bb8

Change-Id: I5cef132cdfad35969f686f32ae244a9ded64615d
parents f486d83a d77c0bb8

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

+6 −5
Original line number Diff line number Diff line
@@ -329,12 +329,13 @@ public class BluetoothOppManager { 
     * Get device name per bluetooth address.

     */

    public String getDeviceName(BluetoothDevice device) {

        String deviceName;

        String deviceName = null;



        if (device != null) {

            deviceName = device.getAliasName();

            if (deviceName == null) {

                deviceName = BluetoothOppPreference.getInstance(mContext).getName(device);



        if (deviceName == null && mAdapter != null) {

            deviceName = device.getName();

            }

        }



        if (deviceName == null) {