drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Telephony: Fix merge issue "Set enabled state before notification is sent out."

Browse Source 
The original change-id was I6e84920b8d082fd6da838bccb5333051362bc4bc

Change-Id: I758641f8b29346a868e1b6b454ccd3f2341dffb8
This commit is contained in:
Ramesh Sudini
2011-04-25 12:58:05 -05:00
committed by Wink Saville
parent 41f665a5f9
commit dcbba67afc
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.