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

Commit 9e8bd809 authored by Dave Langemak's avatar Dave Langemak Committed by Android (Google) Code Review
Browse files

Merge "Move mobile data dis/enable to Telephony" into lmp-preview-dev

parents 9c3c57f7 34cdd1a8

src/com/android/settings/DataUsageSummary.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -192,7 +192,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
    private INetworkManagementService mNetworkService;

    private INetworkManagementService mNetworkService;

    private INetworkStatsService mStatsService;

    private INetworkStatsService mStatsService;

    private NetworkPolicyManager mPolicyManager;

    private NetworkPolicyManager mPolicyManager;

    private ConnectivityManager mConnService;

    private TelephonyManager mTelephonyManager;







    private INetworkStatsSession mStatsSession;

    private INetworkStatsSession mStatsSession;
@@ -274,7 +275,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
        mStatsService = INetworkStatsService.Stub.asInterface(

        mStatsService = INetworkStatsService.Stub.asInterface(

                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));

                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));

        mPolicyManager = NetworkPolicyManager.from(context);

        mPolicyManager = NetworkPolicyManager.from(context);

        mConnService = ConnectivityManager.from(context);

        mTelephonyManager = TelephonyManager.from(context);





        mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);

        mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
@@ -872,13 +873,13 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
            // TODO: deprecate and remove this once enabled flag is on policy

            // TODO: deprecate and remove this once enabled flag is on policy

            return mMobileDataEnabled;

            return mMobileDataEnabled;

        } else {

        } else {

            return mConnService.getMobileDataEnabled();

            return mTelephonyManager.getDataEnabled();

        }

        }

    }

    }





    private void setMobileDataEnabled(boolean enabled) {

    private void setMobileDataEnabled(boolean enabled) {

        if (LOGD) Log.d(TAG, "setMobileDataEnabled()");

        if (LOGD) Log.d(TAG, "setMobileDataEnabled()");

        mConnService.setMobileDataEnabled(enabled);

        mTelephonyManager.setDataEnabled(enabled);

        mMobileDataEnabled = enabled;

        mMobileDataEnabled = enabled;

        updatePolicy(false);

        updatePolicy(false);

    }

    }

src/com/android/settings/RadioInfo.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.content.res.Resources;

import android.net.ConnectivityManager;

import android.net.TrafficStats;

import android.net.TrafficStats;

import android.net.Uri;

import android.net.Uri;

import android.os.AsyncResult;

import android.os.AsyncResult;
@@ -917,15 +916,13 @@ public class RadioInfo extends Activity { 




    private MenuItem.OnMenuItemClickListener mToggleData = new MenuItem.OnMenuItemClickListener() {

    private MenuItem.OnMenuItemClickListener mToggleData = new MenuItem.OnMenuItemClickListener() {

        public boolean onMenuItemClick(MenuItem item) {

        public boolean onMenuItemClick(MenuItem item) {

            ConnectivityManager cm =

                    (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);

            int state = mTelephonyManager.getDataState();

            int state = mTelephonyManager.getDataState();

            switch (state) {

            switch (state) {

                case TelephonyManager.DATA_CONNECTED:

                case TelephonyManager.DATA_CONNECTED:

                    cm.setMobileDataEnabled(false);

                    phone.setDataEnabled(false);

                    break;

                    break;

                case TelephonyManager.DATA_DISCONNECTED:

                case TelephonyManager.DATA_DISCONNECTED:

                    cm.setMobileDataEnabled(true);

                    phone.setDataEnabled(true);

                    break;

                    break;

                default:

                default:

                    // do nothing

                    // do nothing