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

Commit 29ac7df7 authored by Ajay Panicker's avatar Ajay Panicker
Browse files

Prevent SQL query from having a bad where clause 

Bug: 33092708
Test: Sanity test MAP on carkit
Change-Id: I6c7f54f60877cf2c57df9b3521604660321214ff
(cherry picked from commit 0552994436e2afdec3d35fed5aac0f87e8e3e0bb)
parent 05e4f69a

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

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




    private String setWhereFilterFolderType(BluetoothMapFolderElement folderElement,

    private String setWhereFilterFolderType(BluetoothMapFolderElement folderElement,

                                            FilterInfo fi) {

                                            FilterInfo fi) {

        String where = "";

        String where = "1=1";

        if(folderElement.shouldIgnore()) {

        if (!folderElement.shouldIgnore()) {

            where = "1=1";

        } else {

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

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

                where = setWhereFilterFolderTypeSms(folderElement.getName());

                where = setWhereFilterFolderTypeSms(folderElement.getName());

            } else if (fi.mMsgType == FilterInfo.TYPE_MMS) {

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

                where = setWhereFilterFolderTypeIm(folderElement.getFolderId());

            }

            }

        }

        }



        return where;

        return where;

    }

    }