Merge "Only unregister the network callback at onPause" into mnc-dev

2015-06-19 20:03:05 +00:00
parent d63e696902 5f6f4cc572
commit 3a839be7c1
1 changed files with 1 additions and 7 deletions
--- 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) {