From a256b7c3b499b1c4b8d18528cba997039359f343 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Fri, 14 Jan 2011 16:53:36 +0800
Subject: [PATCH] Fix the re-entrance of VpnSetting issue.

bug:3292801
Change-Id: I77c57d789754f175ce9e43ad77ff2edb711c2316
---
 src/com/android/settings/vpn/VpnSettings.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index 058761948e3..960d37e4ec4 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -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();
         }