diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-08 17:19:53 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-08 17:19:53 -0700 |
commit | 658779f5d81031dc2c34ef6bc374fad394d01465 (patch) | |
tree | 933339c55deb89bfba70cb5dbae38333c5d576b3 /telephony | |
parent | 1eeeae59d07ccc6b7db865b942d3e0b9394b1a59 (diff) | |
parent | 561538879bdec19cb0cd2306f1ecacff3ea7a199 (diff) | |
download | frameworks_base-658779f5d81031dc2c34ef6bc374fad394d01465.zip frameworks_base-658779f5d81031dc2c34ef6bc374fad394d01465.tar.gz frameworks_base-658779f5d81031dc2c34ef6bc374fad394d01465.tar.bz2 |
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/ApnSetting.java | 30 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 9 |
2 files changed, 21 insertions, 18 deletions
diff --git a/telephony/java/com/android/internal/telephony/ApnSetting.java b/telephony/java/com/android/internal/telephony/ApnSetting.java index 20dbaf3..b88bcf7 100644 --- a/telephony/java/com/android/internal/telephony/ApnSetting.java +++ b/telephony/java/com/android/internal/telephony/ApnSetting.java @@ -23,21 +23,21 @@ public class ApnSetting { static final String V2_FORMAT_REGEX = "^\\[ApnSettingV2\\]\\s*"; - public String carrier; - public String apn; - public String proxy; - public String port; - public String mmsc; - public String mmsProxy; - public String mmsPort; - public String user; - public String password; - public int authType; - public String[] types; - public int id; - public String numeric; - public String protocol; - public String roamingProtocol; + public final String carrier; + public final String apn; + public final String proxy; + public final String port; + public final String mmsc; + public final String mmsProxy; + public final String mmsPort; + public final String user; + public final String password; + public final int authType; + public final String[] types; + public final int id; + public final String numeric; + public final String protocol; + public final String roamingProtocol; public ApnSetting(int id, String numeric, String carrier, String apn, String proxy, String port, diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index e0f3a1d..816d7ad 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -338,11 +338,14 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { /** * 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"); ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT); - if (defaultApnContext != null && defaultApnContext.getApnSetting() != null) { - return defaultApnContext.getApnSetting().apn; + if (defaultApnContext != null) { + ApnSetting apnSetting = defaultApnContext.getApnSetting(); + if (apnSetting != null) { + return apnSetting.apn; + } } return null; } |