Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01f8961b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8fa81e8f 41802905

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

+1 −1
Original line number Diff line number Diff line
@@ -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()));

    }



    /**