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

Commit 35601b5d authored by Jack Yu's avatar Jack Yu
Browse files

Deprecated the resource config_tether_apndata 

The resource has been migrated into the database so we can remove
this resource now.

Test: Telephony sanity tests
Bug: 113942223
Merged-In: I12266ce8806d0045583562b52cad2dce4ea4fecb
Change-Id: I12266ce8806d0045583562b52cad2dce4ea4fecb
(cherry picked from commit a3c5cd95)
parent bfb332a7

src/java/com/android/internal/telephony/Phone.java

+1 −2
Original line number Diff line number Diff line
@@ -2815,8 +2815,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    }



    /**

     * Check if TETHER_DUN_APN setting or config_tether_apndata includes APN that matches

     * current operator.

     * Check if there are matching tethering (i.e DUN) for the carrier.

     * @return true if there is a matching DUN APN.

     */

    public boolean hasMatchedTetherApnSetting() {

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

+1 −18
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import android.util.Pair; 
import android.util.SparseArray;

import android.view.WindowManager;



import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CarrierActionAgent;

import com.android.internal.telephony.DctConstants;
@@ -1737,29 +1736,13 @@ public class DcTracker extends Handler { 
        ArrayList<ApnSetting> retDunSettings = new ArrayList<ApnSetting>();



        // Places to look for tether APN in order: TETHER_DUN_APN setting (to be deprecated soon),

        // APN database, and config_tether_apndata resource (to be deprecated soon).

        // APN database

        String apnData = Settings.Global.getString(mResolver, Settings.Global.TETHER_DUN_APN);

        if (!TextUtils.isEmpty(apnData)) {

            dunCandidates.addAll(ApnSetting.arrayFromString(apnData));

            if (VDBG) log("fetchDunApns: dunCandidates from Setting: " + dunCandidates);

        }



        // todo: remove this and config_tether_apndata after APNs are moved from overlay to apns xml

        // If TETHER_DUN_APN isn't set or APN database doesn't have dun APN,

        // try the resource as last resort.

        if (dunCandidates.isEmpty()) {

            String[] apnArrayData = mPhone.getContext().getResources()

                .getStringArray(R.array.config_tether_apndata);

            if (!ArrayUtils.isEmpty(apnArrayData)) {

                for (String apnString : apnArrayData) {

                    ApnSetting apn = ApnSetting.fromString(apnString);

                    // apn may be null if apnString isn't valid or has error parsing

                    if (apn != null) dunCandidates.add(apn);

                }

                if (VDBG) log("fetchDunApns: dunCandidates from resource: " + dunCandidates);

            }

        }



        if (dunCandidates.isEmpty()) {

            if (!ArrayUtils.isEmpty(mAllApnSettings)) {

                for (ApnSetting apn : mAllApnSettings) {