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 am: 01f8961bce

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5379f67519077a60ac692babb18ba74a6ab23cb6
This commit is contained in:
TreeHugger Robot
2021-02-24 08:15:20 +00:00
committed by Automerger Merge Worker
parent 538165c1d7 01f8961bce
commit e40cc0a9d2
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) {
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()));
}
/**