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

am 9d5ac7bd: am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."

Browse Source 
* commit '9d5ac7bd8ac92ac8fda2e1ac500438ffe6e3aa0f':
  Telephony: Fix merge issue "Set enabled state before notification is sent out."
This commit is contained in:
Ramesh Sudini
2011-04-26 01:35:20 -07:00
committed by Android Git Automerger
parent 88eb5c07f5 9d5ac7bd8a
commit bfc57acdb8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1596,13 +1596,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
apnContext.setState(State.IDLE);
apnContext.setApnSetting(null);
mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
// Check if APN disabled.
if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) {
apnContext.setEnabled(false);
apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE);
}
mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
// if all data connection are gone, check whether Airplane mode request was
// pending.