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

Commit 943417fd authored by Etan Cohen's avatar Etan Cohen Committed by Android Git Automerger
Browse files

am b1103de1: Merge "Fix data call issue for null APN" into mnc-dev 

* commit 'b1103de1':
  Fix data call issue for null APN
parents 2a0805b3 b1103de1

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

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.PendingIntent; 
import android.content.Context;

import android.net.NetworkConfig;

import android.telephony.Rlog;

import android.text.TextUtils;



import com.android.internal.R;

import com.android.internal.telephony.DctConstants;
@@ -262,7 +263,8 @@ public class ApnContext { 
    public boolean isProvisioningApn() {

        String provisioningApn = mContext.getResources()

                .getString(R.string.mobile_provisioning_apn);

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

        if (!TextUtils.isEmpty(provisioningApn) &&

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

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

        } else {

            return false;