summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/vpn2
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2015-06-17 18:43:59 -0700
committerRobin Lee <rgl@google.com>2015-06-17 18:44:58 -0700
commit5f6f4cc572589674196e836904c4b27f84f21934 (patch)
tree0968e7e73e7c4ad0017480e3c7f36043ff282f59 /src/com/android/settings/vpn2
parent2c55f738c4336a3f379f94f4142c20a473ae3a9a (diff)
downloadpackages_apps_Settings-5f6f4cc572589674196e836904c4b27f84f21934.zip
packages_apps_Settings-5f6f4cc572589674196e836904c4b27f84f21934.tar.gz
packages_apps_Settings-5f6f4cc572589674196e836904c4b27f84f21934.tar.bz2
Only unregister the network callback at onPause
Bug: 21592804 Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
Diffstat (limited to 'src/com/android/settings/vpn2')
-rw-r--r--src/com/android/settings/vpn2/VpnSettings.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 6ed00f7..a17781c 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -120,12 +120,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements
}
@Override
- public void onDestroy() {
- mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
- super.onDestroy();
- }
-
- @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.vpn, menu);
@@ -193,7 +187,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
@Override
public void onPause() {
- // Pause monitoring
+ // Stop monitoring
mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
if (mUpdater != null) {