commit 01f8961bce7bbf64e1e9e95eccd8c7b5a64c7251
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 24 07:35:31 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 24 07:35:31 2021 +0000
tree b9c875f91911533343a62e3bdb207749d1ee8123
parent 8fa81e8f52e98f4f8dab2ca819f69a0b36d8dd0a
parent 41802905f92fba7e88921f695b7bdd3387cc19e7

Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev

core/java/android/hardware/usb/AccessoryFilter.java

diff --git a/core/java/android/hardware/usb/AccessoryFilter.java b/core/java/android/hardware/usb/AccessoryFilter.java
index f22dad4..f4c73d5 100644
--- a/core/java/android/hardware/usb/AccessoryFilter.java
+++ b/core/java/android/hardware/usb/AccessoryFilter.java
@@ -101,7 +101,7 @@
     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()));
     }
 
     /**