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

Commit 5f610b73 authored Apr 30, 2012 by Robert Greenwalt Committed by Android (Google) Code Review Apr 30, 2012

Merge "Fix data roaming notification." into jb-dev

parents 9e2b578f 4dafaf11

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1139,6 +1139,14 @@ public abstract class DataConnectionTracker extends Handler {
	mUserDataEnabled = enabled;		mUserDataEnabled = enabled;
	Settings.Secure.putInt(mPhone.getContext().getContentResolver(),		Settings.Secure.putInt(mPhone.getContext().getContentResolver(),
	Settings.Secure.MOBILE_DATA, enabled ? 1 : 0);		Settings.Secure.MOBILE_DATA, enabled ? 1 : 0);
			if (getDataOnRoamingEnabled() == false &&
			mPhone.getServiceState().getRoaming() == true) {
			if (enabled) {
			notifyOffApnsOfAvailability(Phone.REASON_ROAMING_ON);
			} else {
			notifyOffApnsOfAvailability(Phone.REASON_DATA_DISABLED);
			}
			}
	if (prevEnabled != getAnyDataEnabled()) {		if (prevEnabled != getAnyDataEnabled()) {
	if (!prevEnabled) {		if (!prevEnabled) {
	resetAllRetryCounts();		resetAllRetryCounts();

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -629,6 +629,8 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
	*/		*/
	@Override		@Override
	protected void onRoamingOff() {		protected void onRoamingOff() {
			if (mUserDataEnabled == false) return;

	if (getDataOnRoamingEnabled() == false) {		if (getDataOnRoamingEnabled() == false) {
	notifyOffApnsOfAvailability(Phone.REASON_ROAMING_OFF);		notifyOffApnsOfAvailability(Phone.REASON_ROAMING_OFF);
	trySetupData(Phone.REASON_ROAMING_OFF);		trySetupData(Phone.REASON_ROAMING_OFF);
	@@ -642,6 +644,8 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
	*/		*/
	@Override		@Override
	protected void onRoamingOn() {		protected void onRoamingOn() {
			if (mUserDataEnabled == false) return;

	if (getDataOnRoamingEnabled()) {		if (getDataOnRoamingEnabled()) {
	trySetupData(Phone.REASON_ROAMING_ON);		trySetupData(Phone.REASON_ROAMING_ON);
	notifyDataConnection(Phone.REASON_ROAMING_ON);		notifyDataConnection(Phone.REASON_ROAMING_ON);

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1863,6 +1863,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
	protected void onRoamingOff() {		protected void onRoamingOff() {
	if (DBG) log("onRoamingOff");		if (DBG) log("onRoamingOff");

			if (mUserDataEnabled == false) return;

	if (getDataOnRoamingEnabled() == false) {		if (getDataOnRoamingEnabled() == false) {
	notifyOffApnsOfAvailability(Phone.REASON_ROAMING_OFF);		notifyOffApnsOfAvailability(Phone.REASON_ROAMING_OFF);
	setupDataOnReadyApns(Phone.REASON_ROAMING_OFF);		setupDataOnReadyApns(Phone.REASON_ROAMING_OFF);
	@@ -1873,6 +1875,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {

	@Override		@Override
	protected void onRoamingOn() {		protected void onRoamingOn() {
			if (mUserDataEnabled == false) return;

	if (getDataOnRoamingEnabled()) {		if (getDataOnRoamingEnabled()) {
	if (DBG) log("onRoamingOn: setup data on roaming");		if (DBG) log("onRoamingOn: setup data on roaming");
	setupDataOnReadyApns(Phone.REASON_ROAMING_ON);		setupDataOnReadyApns(Phone.REASON_ROAMING_ON);