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

Commit 033e0432 authored by Daniel Peykov's avatar Daniel Peykov Committed by Android (Google) Code Review
Browse files

Merge "Fix possible NPE when matching accessory version"

parents 27e222aa 25dca30e

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

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

    }



    /**