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

Commit 33a8ddec authored by jiayanhong's avatar jiayanhong
Browse files

Fixed DC cursor not close issue 

DcTracker#getPreferredApnSetId() did not close cursor correctly
after querying apn_set_id and maybe lead to memory leaks.

Test: manual + CodeDEX scan
Change-Id: Ia43024d7962793d15861c56fb0e33b5e5619c4b1
parent ee497c36

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

100644 → 100755
+13 −2
Original line number Diff line number Diff line
@@ -1780,13 +1780,24 @@ public class DcTracker extends Handler { 
                .query(Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI,

                    "preferapnset/subId/" + mPhone.getSubId()),

                        new String[] {Telephony.Carriers.APN_SET_ID}, null, null, null);

        if (c == null) {

            loge("getPreferredApnSetId: cursor is null");

            return Telephony.Carriers.NO_SET_SET;

        }



        int setId;

        if (c.getCount() < 1) {

            loge("getPreferredApnSetId: no APNs found");

            return Telephony.Carriers.NO_SET_SET;

            setId = Telephony.Carriers.NO_SET_SET;

        } else {

            c.moveToFirst();

            return c.getInt(0 /* index of Telephony.Carriers.APN_SET_ID */);

            setId = c.getInt(0 /* index of Telephony.Carriers.APN_SET_ID */);

        }



        if (!c.isClosed()) {

            c.close();

        }

        return setId;

    }



    public boolean hasMatchedTetherApnSetting() {