summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorJohn Huang <>2009-03-24 22:31:33 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 22:31:33 -0700
commit1d4613c1ec6ddf8aec3f723a7cab4253d19f9e66 (patch)
treebe4975b304fc22c52d502bffda017d6b9f8796d3 /telephony/java
parent079c6f64f998c62028290d9ef4c8b88ef0f7563c (diff)
downloadframeworks_base-1d4613c1ec6ddf8aec3f723a7cab4253d19f9e66.zip
frameworks_base-1d4613c1ec6ddf8aec3f723a7cab4253d19f9e66.tar.gz
frameworks_base-1d4613c1ec6ddf8aec3f723a7cab4253d19f9e66.tar.bz2
Automated import from //branches/donutburger/...@142336,142336
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/DataConnectionTracker.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/DataConnectionTracker.java
index 999a508..02a6841 100644
--- a/telephony/java/com/android/internal/telephony/gsm/DataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/DataConnectionTracker.java
@@ -1693,6 +1693,7 @@ final class DataConnectionTracker extends Handler
if (allApns.isEmpty()) {
if (DBG) log("No APN found for carrier: " + operator);
+ preferredApn = null;
notifyNoData(PdpConnection.PdpFailCause.BAD_APN);
} else {
preferredApn = getPreferredApn();
@@ -1819,7 +1820,7 @@ final class DataConnectionTracker extends Handler
cursor.moveToFirst();
pos = cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers._ID));
for(ApnSetting p:allApns) {
- if (p.id == pos) {
+ if (p.id == pos && p.canHandleType(mRequestedApnType)) {
cursor.close();
return p;
}