commit dd466152dd1b88f7b5bd73c47715eb84b76e6dab
author Robert Greenwalt <rgreenwalt@google.com> Tue Oct 18 14:29:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 18 14:29:50 2011 -0700
tree 9adfe71f9596b475e7f93e03b59f75d46371bad5
parent 87bc53de2adf479ad5a5e226bf3d8fd31af6dc21
parent a4bc82aca55e8b7f4c2f1bc7957595aea06dfac4

Merge "Initialize Hipri correctly." into ics-mr0

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index ac3cdb8..e166401 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -273,7 +273,14 @@
                 break;
             case ConnectivityManager.TYPE_MOBILE_HIPRI:
                 apnContext = addApnContext(Phone.APN_TYPE_HIPRI);
-                break;
+                ApnContext defaultContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);
+                if (defaultContext != null) {
+                    applyNewState(apnContext, apnContext.isEnabled(),
+                            defaultContext.getDependencyMet());
+                } else {
+                    // the default will set the hipri dep-met when it is created
+                }
+                continue;
             case ConnectivityManager.TYPE_MOBILE_FOTA:
                 apnContext = addApnContext(Phone.APN_TYPE_FOTA);
                 break;