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

Commit ce139817 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Prevent SQL query from having a bad where clause" am: 6c58f22c 

am: 47f23e1d

Change-Id: I7bb275568ea5a8c5d8fc12f356005331320a79f9
parents 9ef833f8 47f23e1d

src/com/android/bluetooth/map/BluetoothMapContent.java

+3 −4
Original line number Diff line number Diff line
@@ -1650,10 +1650,8 @@ public class BluetoothMapContent { 


    private String setWhereFilterFolderType(BluetoothMapFolderElement folderElement,

                                            FilterInfo fi) {

        String where = "";

        if(folderElement.shouldIgnore()) {

            where = "1=1";

        } else {

        String where = "1=1";

        if (!folderElement.shouldIgnore()) {

            if (fi.mMsgType == FilterInfo.TYPE_SMS) {

                where = setWhereFilterFolderTypeSms(folderElement.getName());

            } else if (fi.mMsgType == FilterInfo.TYPE_MMS) {
@@ -1664,6 +1662,7 @@ public class BluetoothMapContent { 
                where = setWhereFilterFolderTypeIm(folderElement.getFolderId());

            }

        }



        return where;

    }