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

Commit e7862ad8 authored by Sharvil Nanavati's avatar Sharvil Nanavati Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Change auth_type value to 0 if AUTH_TYPE is -1" into cw-e-dev

parents 455b3193 32cefb74

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

+5 −1
Original line number Diff line number Diff line
@@ -1137,6 +1137,10 @@ public final class DcTracker extends DcTrackerBase { 
    private ApnSetting makeApnSetting(Cursor cursor) {

        String[] types = parseTypes(

                cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.TYPE)));

        int auth_type = cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.AUTH_TYPE));

        if (auth_type == -1) {

            auth_type = 0;

        }

        ApnSetting apn = new ApnSetting(

                cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers._ID)),

                cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.NUMERIC)),
@@ -1155,7 +1159,7 @@ public final class DcTracker extends DcTrackerBase { 
                cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.MMSPORT)),

                cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.USER)),

                cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.PASSWORD)),

                cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.AUTH_TYPE)),

                auth_type,

                types,

                cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.PROTOCOL)),

                cursor.getString(cursor.getColumnIndexOrThrow(