diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-14 20:19:42 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-14 20:19:42 -0700 |
commit | 967f7c169c0ff8723a72fce7073f591dcfab018d (patch) | |
tree | 772085b65c991deb437032bec0a4beb098adc69a /telephony/java/com | |
parent | c12801e1ed54e558c9794d3946ec2838c57d1521 (diff) | |
parent | d90ff986b415c7a6747285c1c2d08a2338543cc5 (diff) | |
download | frameworks_base-967f7c169c0ff8723a72fce7073f591dcfab018d.zip frameworks_base-967f7c169c0ff8723a72fce7073f591dcfab018d.tar.gz frameworks_base-967f7c169c0ff8723a72fce7073f591dcfab018d.tar.bz2 |
Merge change 175 into donut
* changes:
telephony: Don't disable an APN type that is not enabled.
Diffstat (limited to 'telephony/java/com')
-rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 1b07add..9ca4610 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -369,13 +369,15 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { * The APN of the specified type is no longer needed. Ensure that if * use of the default APN has not been explicitly disabled, we are connected * to the default APN. - * @param type the APN type. The only valid value currently is {@link Phone#APN_TYPE_MMS}. + * @param type the APN type. The only valid values are currently + * {@link Phone#APN_TYPE_MMS} and {@link Phone#APN_TYPE_SUPL}. * @return */ protected int disableApnType(String type) { Log.d(LOG_TAG, "disableApnType("+type+")"); - if (TextUtils.equals(type, Phone.APN_TYPE_MMS) || - TextUtils.equals(type, Phone.APN_TYPE_SUPL)) { + if ((TextUtils.equals(type, Phone.APN_TYPE_MMS) || + TextUtils.equals(type, Phone.APN_TYPE_SUPL)) + && isEnabled(type)) { removeMessages(EVENT_RESTORE_DEFAULT_APN); setEnabled(type, false); if (isApnTypeActive(Phone.APN_TYPE_DEFAULT)) { |