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

Don't check states when mActiveProfile is present

Browse Source 
and is in IDLE state. checkVpnConnectionStatus() will clean up mActiveProfile
if it's IDLE.

Bug: 3513962
Change-Id: I8289fa321fdbd46def9c8207cef79cb45509897a
This commit is contained in:
Hung-ying Tyan
2011-03-06 01:53:45 +08:00
parent 3f1d39193e
commit 68bcab8532
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,14 @@ public class VpnSettings extends SettingsPreferenceFragment
}
if (!mConnectDialogShowing) {
checkVpnConnectionStatus();
// 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();
}
} else {
// Dismiss the connect dialog in case there is another instance
// trying to operate a vpn connection.