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

am dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread

Browse Source 
* commit 'dfcb8c511635431d536fd3ef1894378f4424ef1a':
  Don't accept a user-defined dun-capable connection
This commit is contained in:
Robert Greenwalt
2011-03-10 11:59:17 -08:00
committed by Android Git Automerger
parent c01fd043a9 dfcb8c5116
commit 55b53d3510
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,6 +361,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected boolean isApnTypeActive(String type) { protected 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);
} }