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

Merge "Move mobile data dis/enable to Telephony"

Browse Source
This commit is contained in:
Robert Greenwalt
2014-05-22 13:23:06 +00:00
committed by Android (Google) Code Review
parent 931e6a8682 0d4c500e98
commit a821f8324a
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/DataUsageSummary.java
View File

@@ -192,7 +192,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
private INetworkManagementService mNetworkService;
private INetworkStatsService mStatsService;
private NetworkPolicyManager mPolicyManager;
private ConnectivityManager mConnService;
private TelephonyManager mTelephonyManager;
private INetworkStatsSession mStatsSession;
@@ -274,7 +275,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
mStatsService = INetworkStatsService.Stub.asInterface(
ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
mPolicyManager = NetworkPolicyManager.from(context);
mConnService = ConnectivityManager.from(context);
mTelephonyManager = TelephonyManager.from(context);
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
return mMobileDataEnabled;
} else {
return mConnService.getMobileDataEnabled();
return mTelephonyManager.getDataEnabled();
}
}
private void setMobileDataEnabled(boolean enabled) {
if (LOGD) Log.d(TAG, "setMobileDataEnabled()");
mConnService.setMobileDataEnabled(enabled);
mTelephonyManager.setDataEnabled(enabled);
mMobileDataEnabled = enabled;
updatePolicy(false);
}

7
src/com/android/settings/RadioInfo.java
View File

@@ -22,7 +22,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.net.TrafficStats;
import android.net.Uri;
import android.os.AsyncResult;
@@ -917,15 +916,13 @@ public class RadioInfo extends Activity {
private MenuItem.OnMenuItemClickListener mToggleData = new MenuItem.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
ConnectivityManager cm =
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
int state = mTelephonyManager.getDataState();
switch (state) {
case TelephonyManager.DATA_CONNECTED:
cm.setMobileDataEnabled(false);
phone.setDataEnabled(false);
break;
case TelephonyManager.DATA_DISCONNECTED:
cm.setMobileDataEnabled(true);
phone.setDataEnabled(true);
break;
default:
// do nothing