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

Commit 41802905 authored by Daniel Peykov's avatar Daniel Peykov Committed by Ricky Niu
Browse files

Fix possible NPE when matching accessory version 

As UsbAccessory#getVersion is nullable, a NPE can occur if the manufacturer/model match.

Bug: 172002066
Bug: 178227159
Bug: 180055624
Change-Id: I751a01e3d182e01e5a9dbc011b60535997f9bc15
(cherry picked from commit 25dca30e)
parent 6628f4e7

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()));

    }



    /**