Merge "Notify the listener when user change the mobile data status toggle." (64c6af7e) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/DefaultPhoneNotifier.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -309,6 +309,16 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
	}		}
	}		}

			@Override
			public void notifyUserMobileDataStateChanged(Phone sender, boolean state) {
			try {
			mRegistry.notifyUserMobileDataStateChangedForPhoneId(
			sender.getPhoneId(), sender.getSubId(), state);
			} catch (RemoteException ex) {
			// system process is dead
			}
			}

	/**		/**
	* Convert the {@link Phone.DataActivityState} enum into the TelephonyManager.DATA_* constants		* Convert the {@link Phone.DataActivityState} enum into the TelephonyManager.DATA_* constants
	* for the public API.		* for the public API.

src/java/com/android/internal/telephony/Phone.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2124,6 +2124,10 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
	mNotifier.notifyDataActivationStateChanged(this, state);		mNotifier.notifyDataActivationStateChanged(this, state);
	}		}

			public void notifyUserMobileDataStateChanged(boolean state) {
			mNotifier.notifyUserMobileDataStateChanged(this, state);
			}

	public void notifySignalStrength() {		public void notifySignalStrength() {
	mNotifier.notifySignalStrength(this);		mNotifier.notifySignalStrength(this);
	}		}

src/java/com/android/internal/telephony/PhoneNotifier.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -62,4 +62,6 @@ public interface PhoneNotifier {
	public void notifyVoiceActivationStateChanged(Phone sender, int activationState);		public void notifyVoiceActivationStateChanged(Phone sender, int activationState);

	public void notifyDataActivationStateChanged(Phone sender, int activationState);		public void notifyDataActivationStateChanged(Phone sender, int activationState);

			public void notifyUserMobileDataStateChanged(Phone sender, boolean state);
	}		}

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -812,6 +812,8 @@ public class DcTracker extends Handler {
	}		}
	}		}

			mPhone.notifyUserMobileDataStateChanged(enabled);

	// TODO: We should register for DataEnabledSetting's data enabled/disabled event and		// TODO: We should register for DataEnabledSetting's data enabled/disabled event and
	// handle the rest from there.		// handle the rest from there.
	if (enabled) {		if (enabled) {

tests/telephonytests/src/com/android/internal/telephony/PhoneStateListenerTest.java

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,8 @@ import android.test.suitebuilder.annotation.SmallTest;
	import org.junit.After;		import org.junit.After;
	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
			import static org.junit.Assert.assertFalse;
			import static org.junit.Assert.assertTrue;
	import java.lang.reflect.Field;		import java.lang.reflect.Field;
	import static org.mockito.Mockito.verify;		import static org.mockito.Mockito.verify;

	@@ -29,6 +31,7 @@ public class PhoneStateListenerTest extends TelephonyTest {

	private PhoneStateListener mPhoneStateListenerUT;		private PhoneStateListener mPhoneStateListenerUT;
	private PhoneStateListenerHandler mPhoneStateListenerHandler;		private PhoneStateListenerHandler mPhoneStateListenerHandler;
			private boolean mUserMobileDataState = false;

	private class PhoneStateListenerHandler extends HandlerThread {		private class PhoneStateListenerHandler extends HandlerThread {
	private PhoneStateListenerHandler(String name) {		private PhoneStateListenerHandler(String name) {
	@@ -45,6 +48,13 @@ public class PhoneStateListenerTest extends TelephonyTest {
	mServiceState.setDataRegState(serviceState.getDataRegState());		mServiceState.setDataRegState(serviceState.getDataRegState());
	setReady(true);		setReady(true);
	}		}

			@Override
			public void onUserMobileDataStateChanged(boolean state) {
			logd("User Mobile Data State Changed");
			mUserMobileDataState = true;
			setReady(true);
			}
	};		};
	setReady(true);		setReady(true);
	}		}
	@@ -81,4 +91,18 @@ public class PhoneStateListenerTest extends TelephonyTest {
	verify(mServiceState).setVoiceRegState(ServiceState.STATE_EMERGENCY_ONLY);		verify(mServiceState).setVoiceRegState(ServiceState.STATE_EMERGENCY_ONLY);
	}		}

			@Test @SmallTest
			public void testTriggerUserMobileDataStateChanged() throws Exception {
			Field field = PhoneStateListener.class.getDeclaredField("callback");
			field.setAccessible(true);

			assertFalse(mUserMobileDataState);

			setReady(false);
			((IPhoneStateListener) field.get(mPhoneStateListenerUT)).onUserMobileDataStateChanged(true);
			waitUntilReady();

			assertTrue(mUserMobileDataState);
			}

	}		}