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

Commit ba835937 authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "[Pandora] Return RemoteNotFound when device name is null" am: bb8e15c2 am: 061b28ab 

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



Change-Id: I0878fd51c5891ad22afa779a7a27536160b8627c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a1b2cba 061b28ab

android/pandora/server/src/com/android/pandora/Host.kt

+6 −1
Original line number Diff line number Diff line
@@ -687,7 +687,12 @@ class Host(private val context: Context, private val server: Server) : HostImplB 
        } else {

          request.address.toBluetoothDevice(bluetoothAdapter)

        }

      GetRemoteNameResponse.newBuilder().setName(device.name).build()

      val deviceName = device.name

      if (deviceName == null) {

        GetRemoteNameResponse.newBuilder().setRemoteNotFound(Empty.getDefaultInstance()).build()

      } else{

        GetRemoteNameResponse.newBuilder().setName(deviceName).build()

      }

    }

  }

}