From 41802905f92fba7e88921f695b7bdd3387cc19e7 Mon Sep 17 00:00:00 2001 From: Daniel Peykov Date: Mon, 2 Nov 2020 18:04:53 +0000 Subject: Fix possible NPE when matching accessory version As UsbAccessory#getVersion is nullable, a NPE can occur if the manufacturer/model match. Bug: 172002066 Bug: 178227159 Bug: 180055624 Change-Id: I751a01e3d182e01e5a9dbc011b60535997f9bc15 (cherry picked from commit 25dca30e2f1fe1a25a6ae0b9ad556902cf722d46) --- core/java/android/hardware/usb/AccessoryFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/hardware/usb/AccessoryFilter.java b/core/java/android/hardware/usb/AccessoryFilter.java index f22dad4124d2..f4c73d56e433 100644 --- a/core/java/android/hardware/usb/AccessoryFilter.java +++ b/core/java/android/hardware/usb/AccessoryFilter.java @@ -101,7 +101,7 @@ public class AccessoryFilter { public boolean matches(UsbAccessory acc) { if (mManufacturer != null && !acc.getManufacturer().equals(mManufacturer)) return false; if (mModel != null && !acc.getModel().equals(mModel)) return false; - return !(mVersion != null && !acc.getVersion().equals(mVersion)); + return !(mVersion != null && !mVersion.equals(acc.getVersion())); } /** -- cgit v1.2.3-59-g8ed1b