PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 645c4e32: am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev

Browse Source 
* commit '645c4e327cda52b5dbc9560aece66edb075d7658':
  Only unregister the network callback at onPause
This commit is contained in:
Robin Lee
2015-06-19 21:40:34 +00:00
committed by Android Git Automerger
parent 0591282f2a 645c4e327c
commit b745831e3f
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -119,12 +119,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements
addPreferencesFromResource(R.xml.vpn_settings2); addPreferencesFromResource(R.xml.vpn_settings2);
} }
@Override
public void onDestroy() {
mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
super.onDestroy();
}
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
@@ -193,7 +187,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
@Override @Override
public void onPause() { public void onPause() {
// Pause monitoring // Stop monitoring
mConnectivityManager.unregisterNetworkCallback(mNetworkCallback); mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
if (mUpdater != null) { if (mUpdater != null) {