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

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

Merge "PBAP: Check for null in isNameMatchTarget" am: 86321a4d 

am: 94f4427b

Change-Id: I96cb289ca12b20b5df63890f63f34b5c47a107ff
parents 9e11c75d 94f4427b

android/app/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