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

Commit 801a47b6 authored by Sukanya Rajkhowa's avatar Sukanya Rajkhowa Committed by Etan Cohen
Browse files

Fix data call issue for null APN 

When data call is setup on null apn, data call is deactivated
immediately after being set up as Telephony is treating null APN
as provisioning APN. This is because the xml entry for
provisioning APN is empty which is matching empty APN name.

Add isEmpty check for provisioning APN xml entry.

Bug: 22305124
Change-Id: Ifbb3aaaf18926b9209aa05f8346da839178dc803
parent 21c6a490

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;