am dd466152: Merge "Initialize Hipri correctly." into ics-mr0

* commit 'dd466152dd1b88f7b5bd73c47715eb84b76e6dab':
  Initialize Hipri correctly.
This commit is contained in:
Robert Greenwalt
2011-10-18 14:31:47 -07:00
committed by Android Git Automerger

View File

@ -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;