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

Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp

Browse Source
This commit is contained in:
Robert Greenwalt
2011-03-11 14:16:18 -08:00
committed by Android (Google) Code Review
parent 7e6f519c07 fe99eb7548
commit 618377d83d
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
telephony/java/com/android/internal/telephony/DataConnectionTracker.java
View File

@@ -38,6 +38,8 @@ import android.provider.Settings.SettingNotFoundException;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.R;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -360,9 +362,26 @@ public abstract class DataConnectionTracker extends Handler {
public boolean isApnTypeActive(String type) { public boolean isApnTypeActive(String type) {
// TODO: support simultaneous with List instead // TODO: support simultaneous with List instead
if (Phone.APN_TYPE_DUN.equals(type)) {
ApnSetting dunApn = fetchDunApn();
if (dunApn != null) {
return ((mActiveApn != null) && (dunApn.toString().equals(mActiveApn.toString())));
}
}
return mActiveApn != null && mActiveApn.canHandleType(type); return mActiveApn != null && mActiveApn.canHandleType(type);
} }
protected ApnSetting fetchDunApn() {
Context c = mPhone.getContext();
String apnData = Settings.Secure.getString(c.getContentResolver(),
Settings.Secure.TETHER_DUN_APN);
ApnSetting dunSetting = ApnSetting.fromString(apnData);
if (dunSetting != null) return dunSetting;
apnData = c.getResources().getString(R.string.config_tether_apndata);
return ApnSetting.fromString(apnData);
}
public String[] getActiveApnTypes() { public String[] getActiveApnTypes() {
String[] result; String[] result;
if (mActiveApn != null) { if (mActiveApn != null) {

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

@@ -1164,17 +1164,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
} }
} }
private ApnSetting fetchDunApn() {
Context c = mPhone.getContext();
String apnData = Settings.Secure.getString(c.getContentResolver(),
Settings.Secure.TETHER_DUN_APN);
ApnSetting dunSetting = ApnSetting.fromString(apnData);
if (dunSetting != null) return dunSetting;
apnData = c.getResources().getString(R.string.config_tether_apndata);
return ApnSetting.fromString(apnData);
}
/** /**
* Build a list of APNs to be used to create PDP's. * Build a list of APNs to be used to create PDP's.
* *