Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-24 07:35:31 +00:00
committed by Android (Google) Code Review
parent 8fa81e8f52 41802905f9
commit 01f8961bce
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/usb/AccessoryFilter.java
View File

@@ -101,7 +101,7 @@ public class AccessoryFilter {
public boolean matches(UsbAccessory acc) { public boolean matches(UsbAccessory acc) {
if (mManufacturer != null && !acc.getManufacturer().equals(mManufacturer)) return false; if (mManufacturer != null && !acc.getManufacturer().equals(mManufacturer)) return false;
if (mModel != null && !acc.getModel().equals(mModel)) 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()));
} }
/** /**