Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a839be7 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

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

parents d63e6969 5f6f4cc5

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

+1 −7
Original line number Diff line number Diff line
@@ -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) {