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

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

Browse Source 
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
  Add a config to set Dun capabilities.
This commit is contained in:
Robert Greenwalt
2012-02-14 13:39:25 -08:00
committed by Android Git Automerger
parent e6ccc94ef9 fc19160a6a
commit e3776a47db
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/res/values/config.xml
View File

@@ -227,6 +227,13 @@
<item>4</item>
</integer-array>
<!-- If the DUN connection for this CDMA device supports more than just DUN -->
<!-- traffic you should list them here. -->
<!-- If this device is not CDMA this is ignored. If this list is empty on -->
<!-- a DUN-requiring CDMA device, the DUN APN will just support just DUN. -->
<string-array translatable="false" name="config_cdma_dun_supported_types">
</string-array>
<!-- String containing the apn value for tethering. May be overriden by secure settings
TETHER_DUN_APN. Value is a comma separated series of strings:
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"

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

@@ -93,6 +93,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 */
@@ -118,6 +121,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
@@ -343,8 +361,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;