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

Commit 0b4317aa authored by Shareef Ali's avatar Shareef Ali Committed by Gerrit Code Review
Browse files

Telephony: check if the provisioning apn is actually empty before 

checking if they are equal.  Fixes cases where the stubbed apn
(empty) equal to the empty provisioning apn.

Fixes no IP issues on CDMA data types.

Change-Id: Id7bda83778f5ce59c87463c4d44fc5768dbc4a08
parent 17aa56ec

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

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.internal.telephony.dataconnection; 
import android.app.PendingIntent;

import android.content.Context;

import android.telephony.Rlog;

import android.text.TextUtils;



import com.android.internal.R;

import com.android.internal.telephony.DctConstants;
@@ -229,6 +230,9 @@ public class ApnContext { 
    public boolean isProvisioningApn() {

        String provisioningApn = mContext.getResources()

                .getString(R.string.mobile_provisioning_apn);

        if (TextUtils.isEmpty(provisioningApn)) {

            return false;

        }

        if ((mApnSetting != null) && (mApnSetting.apn != null)) {

            return (mApnSetting.apn.equals(provisioningApn));

        } else {