summaryrefslogtreecommitdiffstats
path: root/telephony/java/com/android
diff options
context:
space:
mode:
authorJohn Huang <>2009-03-24 19:26:17 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 19:26:17 -0700
commit46e6878c4b18b74e820dec5a183125ba9e00096f (patch)
tree1bdfed0d10dc3fc0c7caad10deb45d05a5e55d47 /telephony/java/com/android
parent49fc71f3f9e5c1f4cf2848dd3dec1cdea33b236f (diff)
downloadframeworks_base-46e6878c4b18b74e820dec5a183125ba9e00096f.zip
frameworks_base-46e6878c4b18b74e820dec5a183125ba9e00096f.tar.gz
frameworks_base-46e6878c4b18b74e820dec5a183125ba9e00096f.tar.bz2
Automated import from //branches/cupcake/...@142334,142334
Diffstat (limited to 'telephony/java/com/android')
-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;
}