From b80d71c9f5b08cc2bf69c86a0a35cd7e0d7e4341 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 19 Oct 2022 14:46:13 -0500
Subject: [PATCH] backends/p4android/scanner: fix crash when getting rssi

In #1047, the call to getRssi() was broken by using the wrong object.

This fixes the mistake.

Fixes #1085.
---
 CHANGELOG.rst                       | 3 +--
 bleak/backends/p4android/scanner.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7957a67f..3637b082 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,8 +12,7 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
 
 Fixed
 -----
-* BlueZ: Cancel the device discovery wait task if the device disconnects in
-  between to avoid a timeout
+* Fixed crash in Android backend introduced in v0.19.0. Fixes #1085.
 
 `0.19.0`_ (2022-10-13)
 ======================
diff --git a/bleak/backends/p4android/scanner.py b/bleak/backends/p4android/scanner.py
index 7a2dd69b..5fe4a0dc 100644
--- a/bleak/backends/p4android/scanner.py
+++ b/bleak/backends/p4android/scanner.py
@@ -256,7 +256,7 @@ def _handle_scan_result(self, result):
             service_data=service_data,
             service_uuids=service_uuids,
             tx_power=tx_power,
-            rssi=native_device.getRssi(),
+            rssi=result.getRssi(),
             platform_data=(result,),
         )