OSDN Git Service

Only unregister the network callback at onPause
authorRobin Lee <rgl@google.com>
Thu, 18 Jun 2015 01:43:59 +0000 (18:43 -0700)
committerRobin Lee <rgl@google.com>
Thu, 18 Jun 2015 01:44:58 +0000 (18:44 -0700)
Bug: 21592804
Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e

src/com/android/settings/vpn2/VpnSettings.java

index 6ed00f7..a17781c 100644 (file)
@@ -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) {