PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f8a3a17c: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1

Browse Source 
* commit 'f8a3a17c1e8cb71342b63cc08388883dedeb3180':
  Don't check states when mActiveProfile is present
This commit is contained in:
Hung-ying Tyan
2011-03-08 07:38:55 -08:00
committed by Android Git Automerger
parent bada05855b f8a3a17c1e
commit 0da4ec4981
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/vpn/VpnSettings.java
View File

@@ -221,7 +221,14 @@ public class VpnSettings extends SettingsPreferenceFragment
} }
if (!mConnectDialogShowing) { if (!mConnectDialogShowing) {
// If mActiveProfile is not null but it's in IDLE state, then a
// retry dialog must be showing now as the previous connection
// attempt failed. In this case, don't call checkVpnConnectionStatus()
// as it will clean up mActiveProfile due to the IDLE state.
if ((mActiveProfile == null)
|| (mActiveProfile.getState() != VpnState.IDLE)) {
checkVpnConnectionStatus(); checkVpnConnectionStatus();
}
} else { } else {
// Dismiss the connect dialog in case there is another instance // Dismiss the connect dialog in case there is another instance
// trying to operate a vpn connection. // trying to operate a vpn connection.