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

This commit is contained in:
TreeHugger Robot
2021-02-24 07:35:31 +00:00
committed by Android (Google) Code Review

View File

@@ -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()));
}
/**