Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 175 into donut

Browse Source 
* changes:
  telephony: Don't disable an APN type that is not enabled.
This commit is contained in:
Android (Google) Code Review
2009-04-14 20:19:42 -07:00
parent c12801e1ed d90ff986b4
commit 967f7c169c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -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)) {