diff options
| author | 2021-02-24 08:15:20 +0000 | |
|---|---|---|
| committer | 2021-02-24 08:15:20 +0000 | |
| commit | e40cc0a9d21c232a58ac9fe8801dfa40a4f3e69d (patch) | |
| tree | 9c16a5c00301a6d3c6a207e7b0663d712dcb1cbd | |
| parent | 538165c1d7d2f8c95b7f9d1aebff4d66b23175c4 (diff) | |
| parent | 01f8961bce7bbf64e1e9e95eccd8c7b5a64c7251 (diff) | |
Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev am: 01f8961bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671451
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5379f67519077a60ac692babb18ba74a6ab23cb6
| -rw-r--r-- | core/java/android/hardware/usb/AccessoryFilter.java | 2 |
1 files changed, 1 insertions, 1 deletions
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())); } /** |