From 5f6f4cc572589674196e836904c4b27f84f21934 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Wed, 17 Jun 2015 18:43:59 -0700
Subject: [PATCH] Only unregister the network callback at onPause

Bug: 21592804
Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
---
 src/com/android/settings/vpn2/VpnSettings.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 6ed00f7c772..a17781ca4ce 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -119,12 +119,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         addPreferencesFromResource(R.xml.vpn_settings2);
     }
 
-    @Override
-    public void onDestroy() {
-        mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
-        super.onDestroy();
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
@@ -193,7 +187,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
 
     @Override
     public void onPause() {
-        // Pause monitoring
+        // Stop monitoring
         mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
 
         if (mUpdater != null) {