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

Commit 194f58af authored by greg_huang's avatar greg_huang Committed by android-build-merger
Browse files

Merge "PBAP: Check for null in isNameMatchTarget" 

am: 4c75faae

Change-Id: I3d790c94b2f9db4ed5d86a147a5ef42095b1a898
parents ac7afd6f 4c75faae

src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -478,6 +478,7 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
    }

    }





    private boolean isNameMatchTarget(String name, String target) {

    private boolean isNameMatchTarget(String name, String target) {

        if (name == null) return false;

        String contentTypeName = name;

        String contentTypeName = name;

        if (contentTypeName.endsWith(".vcf")) {

        if (contentTypeName.endsWith(".vcf")) {

            contentTypeName = contentTypeName

            contentTypeName = contentTypeName