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

Commit 6cab9a6e authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE 

* commit 'da2790fa':
  Make ApnSettings threadsafe.
parents d7c5e99c da2790fa

telephony/java/com/android/internal/telephony/ApnSetting.java

+15 −15
Original line number Original line Diff line number Diff line
@@ -23,21 +23,21 @@ public class ApnSetting { 




    static final String V2_FORMAT_REGEX = "^\\[ApnSettingV2\\]\\s*";

    static final String V2_FORMAT_REGEX = "^\\[ApnSettingV2\\]\\s*";





    public String carrier;

    public final String carrier;

    public String apn;

    public final String apn;

    public String proxy;

    public final String proxy;

    public String port;

    public final String port;

    public String mmsc;

    public final String mmsc;

    public String mmsProxy;

    public final String mmsProxy;

    public String mmsPort;

    public final String mmsPort;

    public String user;

    public final String user;

    public String password;

    public final String password;

    public int authType;

    public final int authType;

    public String[] types;

    public final String[] types;

    public int id;

    public final int id;

    public String numeric;

    public final String numeric;

    public String protocol;

    public final String protocol;

    public String roamingProtocol;

    public final String roamingProtocol;





    public ApnSetting(int id, String numeric, String carrier, String apn,

    public ApnSetting(int id, String numeric, String carrier, String apn,

            String proxy, String port,

            String proxy, String port,

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -338,11 +338,14 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
    /**

    /**

     * Return DEFAULT APN due to the limit of the interface

     * Return DEFAULT APN due to the limit of the interface

     */

     */

    public synchronized String getActiveApnString() {

    public String getActiveApnString() {

        if (DBG) log( "get default active apn string");

        if (DBG) log( "get default active apn string");

        ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);

        ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);

        if (defaultApnContext != null && defaultApnContext.getApnSetting() != null) {

        if (defaultApnContext != null) {

            return defaultApnContext.getApnSetting().apn;

            ApnSetting apnSetting = defaultApnContext.getApnSetting();

            if (apnSetting != null) {

                return apnSetting.apn;

            }

        }

        }

        return null;

        return null;

    }

    }