Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dbcc57c6: Fix dependencyMet issues regarding hipri APN.

Browse Source 
* commit 'dbcc57c6f1602da324609ddbaf76f836504733ae':
  Fix dependencyMet issues regarding hipri APN.
This commit is contained in:
Robert Greenwalt
2011-06-29 15:22:50 -07:00
committed by Android Git Automerger
parent 846764e5aa dbcc57c6f1
commit 8745caaf25
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -1535,6 +1535,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected void onSetDependencyMet(String apnType, boolean met) { protected void onSetDependencyMet(String apnType, boolean met) {
// don't allow users to tweak hipri to work around default dependency not met
if (Phone.APN_TYPE_HIPRI.equals(apnType)) return;
ApnContext apnContext = mApnContexts.get(apnType); ApnContext apnContext = mApnContexts.get(apnType);
if (apnContext == null) { if (apnContext == null) {
loge("onSetDependencyMet: ApnContext not found in onSetDependencyMet(" + loge("onSetDependencyMet: ApnContext not found in onSetDependencyMet(" +
@@ -1542,6 +1545,11 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
return; return;
} }
applyNewState(apnContext, apnContext.isEnabled(), met); applyNewState(apnContext, apnContext.isEnabled(), met);
if (Phone.APN_TYPE_DEFAULT.equals(apnType)) {
// tie actions on default to similar actions on HIPRI regarding dependencyMet
apnContext = mApnContexts.get(Phone.APN_TYPE_HIPRI);
if (apnContext != null) applyNewState(apnContext, apnContext.isEnabled(), met);
}
} }
private void applyNewState(ApnContext apnContext, boolean enabled, boolean met) { private void applyNewState(ApnContext apnContext, boolean enabled, boolean met) {