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

Merge "Fix the re-entrance of VpnSetting issue." into honeycomb

Browse Source
This commit is contained in:
Chung-yih Wang
2011-01-17 18:57:41 -08:00
committed by Android (Google) Code Review
parent a0587d028a a256b7c3b4
commit 80ca289b64
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,30 +190,38 @@ public class VpnSettings extends SettingsPreferenceFragment
// for long-press gesture on a profile preference
registerForContextMenu(getListView());
// listen to vpn connectivity event
mVpnManager.registerConnectivityReceiver(mConnectivityReceiver);
retrieveVpnListFromStorage();
checkVpnConnectionStatusInBackground();
restoreInstanceState(savedInstanceState);
}
@Override
public void onPause() {
// ignore vpn connectivity event
mVpnManager.unregisterConnectivityReceiver(mConnectivityReceiver);
super.onPause();
}
@Override
public void onResume() {
super.onResume();
if (DEBUG)
Log.d(TAG, "onResume");
// listen to vpn connectivity event
mVpnManager.registerConnectivityReceiver(mConnectivityReceiver);
if ((mUnlockAction != null) && isKeyStoreUnlocked()) {
Runnable action = mUnlockAction;
mUnlockAction = null;
getActivity().runOnUiThread(action);
}
checkVpnConnectionStatusInBackground();
}
@Override
public void onDestroyView() {
unregisterForContextMenu(getListView());
mVpnManager.unregisterConnectivityReceiver(mConnectivityReceiver);
if ((mShowingDialog != null) && mShowingDialog.isShowing()) {
mShowingDialog.dismiss();
}