drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7a08ef44: am e3776a47: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1

Browse Source 
* commit '7a08ef442ad6138352785690a8e341607d763399':
  Add a config to set Dun capabilities.
This commit is contained in:
Robert Greenwalt
2012-02-15 07:53:51 -08:00
committed by Android Git Automerger
parent 2c2a41e9a4 7a08ef442a
commit f8b8eafc45
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
View File

@ -95,6 +95,9 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
Phone.APN_TYPE_MMS,
Phone.APN_TYPE_HIPRI };
private String[] mDunApnTypes = {
Phone.APN_TYPE_DUN };
private static final int mDefaultApnId = DataConnectionTracker.APN_DEFAULT_ID;
/* Constructor */
@ -121,6 +124,21 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
createAllDataConnectionList();
broadcastMessenger();
Context c = mCdmaPhone.getContext();
String[] t = c.getResources().getStringArray(
com.android.internal.R.array.config_cdma_dun_supported_types);
if (t != null && t.length > 0) {
ArrayList<String> temp = new ArrayList<String>();
for(int i=0; i< t.length; i++) {
if (!Phone.APN_TYPE_DUN.equalsIgnoreCase(t[i])) {
temp.add(t[i]);
}
}
temp.add(0, Phone.APN_TYPE_DUN);
mDunApnTypes = temp.toArray(t);
}
}
@Override
@ -348,8 +366,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
String[] types;
int apnId;
if (mRequestedApnType.equals(Phone.APN_TYPE_DUN)) {
types = new String[1];
types[0] = Phone.APN_TYPE_DUN;
types = mDunApnTypes;
apnId = DataConnectionTracker.APN_DUN_ID;
} else {
types = mDefaultApnTypes;