From a4bc82aca55e8b7f4c2f1bc7957595aea06dfac4 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Tue, 18 Oct 2011 11:49:24 -0700
Subject: [PATCH] Initialize Hipri correctly.

The old code was dependent on the order of things in config.xml.  This fixes that
so hipri will get the correct dependency-met value at startup.  Good ITS test.

bug:5382518
Change-Id: Ie327ab1abbc5697ffab0ed4d8c9d6de321513adb
---
 .../internal/telephony/gsm/GsmDataConnectionTracker.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 78ba7ddd0ba96..82cb45f57d407 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 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
                 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;